diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/score/src/threadqenqueue.c | 37 | ||||
-rw-r--r-- | cpukit/score/src/threadqextract.c | 57 |
2 files changed, 60 insertions, 34 deletions
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c index 7b42cda88c..73098d9701 100644 --- a/cpukit/score/src/threadqenqueue.c +++ b/cpukit/score/src/threadqenqueue.c @@ -7,8 +7,8 @@ * _Thread_queue_Deadlock_fatal(), _Thread_queue_Deadlock_status(), * _Thread_queue_Do_dequeue(), _Thread_queue_Enqueue(), * _Thread_queue_Enqueue_do_nothing_extra(), _Thread_queue_Enqueue_sticky(), - * _Thread_queue_Extract(), _Thread_queue_Extract_locked(), - * _Thread_queue_Path_acquire(), _Thread_queue_Path_release(), + * _Thread_queue_Extract_locked(), _Thread_queue_Path_acquire(), + * _Thread_queue_Path_release(), * _Thread_queue_Resume(),_Thread_queue_Surrender(), * _Thread_queue_Surrender_no_priority(), _Thread_queue_Surrender_sticky(). */ @@ -531,7 +531,7 @@ Status_Control _Thread_queue_Enqueue_sticky( #endif #if defined(RTEMS_MULTIPROCESSING) -static bool _Thread_queue_MP_set_callout( +bool _Thread_queue_MP_set_callout( Thread_Control *the_thread, const Thread_queue_Context *queue_context ) @@ -668,37 +668,6 @@ void _Thread_queue_Resume( } } -void _Thread_queue_Extract( Thread_Control *the_thread ) -{ - Thread_queue_Context queue_context; - Thread_queue_Queue *queue; - - _Thread_queue_Context_initialize( &queue_context ); - _Thread_queue_Context_clear_priority_updates( &queue_context ); - _Thread_Wait_acquire( the_thread, &queue_context ); - - queue = the_thread->Wait.queue; - - if ( queue != NULL ) { - _Thread_Wait_remove_request( the_thread, &queue_context.Lock_context ); - _Thread_queue_Context_set_MP_callout( - &queue_context, - _Thread_queue_MP_callout_do_nothing - ); -#if defined(RTEMS_MULTIPROCESSING) - _Thread_queue_MP_set_callout( the_thread, &queue_context ); -#endif - ( *the_thread->Wait.operations->extract )( - queue, - the_thread, - &queue_context - ); - _Thread_queue_Resume( queue, the_thread, &queue_context ); - } else { - _Thread_Wait_release( the_thread, &queue_context ); - } -} - void _Thread_queue_Surrender( Thread_queue_Queue *queue, Thread_queue_Heads *heads, diff --git a/cpukit/score/src/threadqextract.c b/cpukit/score/src/threadqextract.c new file mode 100644 index 0000000000..0c6efedbaf --- /dev/null +++ b/cpukit/score/src/threadqextract.c @@ -0,0 +1,57 @@ +/** + * @file + * + * @ingroup RTEMSScoreThreadQueue + * + * @brief This source file contains the implementation of + * _Thread_queue_Extract(). + */ + +/* + * COPYRIGHT (c) 1989-2014. + * On-Line Applications Research Corporation (OAR). + * + * Copyright (c) 2015, 2016 embedded brains GmbH. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/score/threadqimpl.h> +#include <rtems/score/threadimpl.h> + +void _Thread_queue_Extract( Thread_Control *the_thread ) +{ + Thread_queue_Context queue_context; + Thread_queue_Queue *queue; + + _Thread_queue_Context_initialize( &queue_context ); + _Thread_queue_Context_clear_priority_updates( &queue_context ); + _Thread_Wait_acquire( the_thread, &queue_context ); + + queue = the_thread->Wait.queue; + + if ( queue != NULL ) { + _Thread_Wait_remove_request( the_thread, &queue_context.Lock_context ); + _Thread_queue_Context_set_MP_callout( + &queue_context, + _Thread_queue_MP_callout_do_nothing + ); +#if defined(RTEMS_MULTIPROCESSING) + _Thread_queue_MP_set_callout( the_thread, &queue_context ); +#endif + ( *the_thread->Wait.operations->extract )( + queue, + the_thread, + &queue_context + ); + _Thread_queue_Resume( queue, the_thread, &queue_context ); + } else { + _Thread_Wait_release( the_thread, &queue_context ); + } +} |