From 32506647001a815e3c0daf25757d386104a07184 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Jul 2014 12:37:36 -0500 Subject: Thread Queue: Merge discipline subroutines into main methods There was a lot of duplication between the discipline subroutines. With the transition to RBTrees for priority discipline, there were only a few lines of source code manipulating the data structure for FIFO and priority. Thus is made sense to fold these back into the main methods. As part of doing this all of the tests for discipline were changed to be in the same order. --- cpukit/score/src/threadqextract.c | 48 +++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-) (limited to 'cpukit/score/src/threadqextract.c') diff --git a/cpukit/score/src/threadqextract.c b/cpukit/score/src/threadqextract.c index 0a9c9d4932..bc7d34686a 100644 --- a/cpukit/score/src/threadqextract.c +++ b/cpukit/score/src/threadqextract.c @@ -7,7 +7,7 @@ */ /* - * COPYRIGHT (c) 1989-2008. + * COPYRIGHT (c) 1989-2014. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -19,7 +19,10 @@ #include "config.h" #endif +#include +#include #include +#include void _Thread_queue_Extract_with_return_code( Thread_queue_Control *the_thread_queue, @@ -27,14 +30,41 @@ void _Thread_queue_Extract_with_return_code( uint32_t return_code ) { - /* - * Can not use indirect function pointer here since Extract priority - * is a macro and the underlying methods do not have the same signature. - */ - if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY ) - return _Thread_queue_Extract_priority( the_thread, return_code ); - else /* must be THREAD_QUEUE_DISCIPLINE_FIFO */ - return _Thread_queue_Extract_fifo( the_thread, return_code ); + ISR_Level level; + + _ISR_Disable( level ); + + if ( !_States_Is_waiting_on_thread_queue( the_thread->current_state ) ) { + _ISR_Enable( level ); + return; + } + + if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_FIFO ) { + _Chain_Extract_unprotected( &the_thread->Object.Node ); + } else { /* must be THREAD_QUEUE_DISCIPLINE_PRIORITY */ + _RBTree_Extract( + &the_thread->Wait.queue->Queues.Priority, + &the_thread->RBNode + ); + } + + the_thread->Wait.queue = NULL; + the_thread->Wait.return_code = return_code; + + if ( !_Watchdog_Is_active( &the_thread->Timer ) ) { + _ISR_Enable( level ); + } else { + _Watchdog_Deactivate( &the_thread->Timer ); + _ISR_Enable( level ); + (void) _Watchdog_Remove( &the_thread->Timer ); + } + + _Thread_Unblock( the_thread ); + +#if defined(RTEMS_MULTIPROCESSING) + if ( !_Objects_Is_local_id( the_thread->Object.id ) ) + _Thread_MP_Free_proxy( the_thread ); +#endif } -- cgit v1.2.3