Changeset 6b8da2b in rtems


Ignore:
Timestamp:
Jan 23, 2008, 1:07:13 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
4a4aabc
Parents:
9185d61
Message:

2008-01-23 Joel Sherrill <joel.sherrill@…>

  • score/src/threadblockingoperationcancel.c: Clean up.
  • score/src/threadqextract.c: Restructure to eliminate dead code.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r9185d61 r6b8da2b  
     12008-01-23      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * score/src/threadblockingoperationcancel.c: Clean up.
     4        * score/src/threadqextract.c: Restructure to eliminate dead code.
     5
    162008-01-22      Joel Sherrill <joel.sherrill@OARcorp.com>
    27
  • cpukit/score/src/threadblockingoperationcancel.c

    r9185d61 r6b8da2b  
    5555
    5656  /*
     57   * The thread is not waiting on anything after this completes.
     58   */
     59  the_thread->Wait.queue = NULL;
     60
     61  /*
    5762   *  If the sync state is timed out, this is very likely not needed.
    5863   *  But better safe than sorry when it comes to critical sections.
     
    6065  if ( _Watchdog_Is_active( &the_thread->Timer ) ) {
    6166    _Watchdog_Deactivate( &the_thread->Timer );
    62     the_thread->Wait.queue = NULL;
    6367    _ISR_Enable( level );
    6468    (void) _Watchdog_Remove( &the_thread->Timer );
  • cpukit/score/src/threadqextract.c

    r9185d61 r6b8da2b  
    4747)
    4848{
    49   switch ( the_thread_queue->discipline ) {
    50     case THREAD_QUEUE_DISCIPLINE_FIFO:
    51       _Thread_queue_Extract_fifo( the_thread_queue, the_thread );
    52       break;
    53     case THREAD_QUEUE_DISCIPLINE_PRIORITY:
    54       _Thread_queue_Extract_priority( the_thread_queue, the_thread );
    55       break;
    56    }
     49  /*
     50   * Can not use indirect function pointer here since Extract priority
     51   * is a macro and the underlying methods do not have the same signature.
     52   */
     53  if  ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY )
     54    _Thread_queue_Extract_priority( the_thread_queue, the_thread );
     55  else /* must be THREAD_QUEUE_DISCIPLINE_FIFO */
     56    _Thread_queue_Extract_fifo( the_thread_queue, the_thread );
     57
    5758}
Note: See TracChangeset for help on using the changeset viewer.