diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-22 21:19:18 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-22 21:19:18 +0000 |
commit | 11c16a64f64cfa23532e118a54bca01e2089bd2e (patch) | |
tree | b39ff76e0ff7cd7832c65a19d14941d6e4e98450 /cpukit/score | |
parent | 2008-01-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-11c16a64f64cfa23532e118a54bca01e2089bd2e.tar.bz2 |
2008-01-22 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/src/eventsurrender.c, rtems/src/ratemonperiod.c,
score/src/threadqdequeue.c, score/src/threadqdequeuefifo.c,
score/src/threadqdequeuepriority.c: Fix bugs encountered while
testing and clean up more code.
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/src/threadqdequeue.c | 16 | ||||
-rw-r--r-- | cpukit/score/src/threadqdequeuefifo.c | 15 | ||||
-rw-r--r-- | cpukit/score/src/threadqdequeuepriority.c | 18 |
3 files changed, 20 insertions, 29 deletions
diff --git a/cpukit/score/src/threadqdequeue.c b/cpukit/score/src/threadqdequeue.c index 160bd6e84c..b9213968b8 100644 --- a/cpukit/score/src/threadqdequeue.c +++ b/cpukit/score/src/threadqdequeue.c @@ -48,11 +48,25 @@ Thread_Control *_Thread_queue_Dequeue( ) { Thread_Control *(*dequeue_p)( Thread_queue_Control * ); + Thread_Control *the_thread; + ISR_Level level; + Thread_blocking_operation_States sync_state; if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY ) dequeue_p = _Thread_queue_Dequeue_priority; else /* must be THREAD_QUEUE_DISCIPLINE_FIFO */ dequeue_p = _Thread_queue_Dequeue_fifo; - return (*dequeue_p)( the_thread_queue ); + the_thread = (*dequeue_p)( the_thread_queue ); + _ISR_Disable( level ); + if ( !the_thread ) { + sync_state = the_thread_queue->sync_state; + if ( (sync_state == THREAD_BLOCKING_OPERATION_TIMEOUT) || + (sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) { + the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_SATISFIED; + the_thread = _Thread_Executing; + } + } + _ISR_Enable( level ); + return the_thread; } diff --git a/cpukit/score/src/threadqdequeuefifo.c b/cpukit/score/src/threadqdequeuefifo.c index d494b90b85..0ea36791fc 100644 --- a/cpukit/score/src/threadqdequeuefifo.c +++ b/cpukit/score/src/threadqdequeuefifo.c @@ -74,17 +74,6 @@ Thread_Control *_Thread_queue_Dequeue_fifo( return the_thread; } - switch ( the_thread_queue->sync_state ) { - case THREAD_BLOCKING_OPERATION_SYNCHRONIZED: - case THREAD_BLOCKING_OPERATION_SATISFIED: - _ISR_Enable( level ); - return NULL; - - case THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED: - case THREAD_BLOCKING_OPERATION_TIMEOUT: - the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_SATISFIED; - _ISR_Enable( level ); - return _Thread_Executing; - } - return NULL; /* this is only to prevent warnings */ + _ISR_Enable( level ); + return NULL; } diff --git a/cpukit/score/src/threadqdequeuepriority.c b/cpukit/score/src/threadqdequeuepriority.c index d9aa1b14f8..1010d58a58 100644 --- a/cpukit/score/src/threadqdequeuepriority.c +++ b/cpukit/score/src/threadqdequeuepriority.c @@ -55,7 +55,6 @@ Thread_Control *_Thread_queue_Dequeue_priority( Chain_Node *last_node; Chain_Node *next_node; Chain_Node *previous_node; - Thread_blocking_operation_States sync; _ISR_Disable( level ); for( index=0 ; @@ -69,21 +68,10 @@ Thread_Control *_Thread_queue_Dequeue_priority( } /* - * If we interrupted a blocking operation, cancel it. + * We did not find a thread to unblock. */ - sync = the_thread_queue->sync_state; - if ( (sync == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) || - (sync == THREAD_BLOCKING_OPERATION_SATISFIED) ) { - _ISR_Enable( level ); - return NULL; - } - - if ( (sync == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) || - (sync == THREAD_BLOCKING_OPERATION_TIMEOUT ) ) { - the_thread_queue->sync_state = THREAD_BLOCKING_OPERATION_SATISFIED; - _ISR_Enable( level ); - return _Thread_Executing; - } + _ISR_Enable( level ); + return NULL; dequeue: the_thread->Wait.queue = NULL; |