diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-08-22 13:17:05 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-08 09:55:26 +0200 |
| commit | 114e40880bb56186d06fc81da29a889d9f2171a5 (patch) | |
| tree | 65e8f132b4ebc8f9e5fa7668c9a6de9e26a33088 /cpukit/score/src | |
| parent | score: Fix warning (diff) | |
| download | rtems-114e40880bb56186d06fc81da29a889d9f2171a5.tar.bz2 | |
score: Simplify thread queue acquire/release
Diffstat (limited to 'cpukit/score/src')
| -rw-r--r-- | cpukit/score/src/threadqenqueue.c | 4 | ||||
| -rw-r--r-- | cpukit/score/src/threadqfirst.c | 8 | ||||
| -rw-r--r-- | cpukit/score/src/threadrestart.c | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c index 5a7fd6def5..81b3948293 100644 --- a/cpukit/score/src/threadqenqueue.c +++ b/cpukit/score/src/threadqenqueue.c @@ -641,7 +641,7 @@ Thread_Control *_Thread_queue_Do_dequeue( _Thread_queue_Context_initialize( &queue_context ); _Thread_queue_Context_set_MP_callout( &queue_context, mp_callout ); - _Thread_queue_Acquire( the_thread_queue, &queue_context.Lock_context ); + _Thread_queue_Acquire( the_thread_queue, &queue_context ); the_thread = _Thread_queue_First_locked( the_thread_queue, operations ); @@ -653,7 +653,7 @@ Thread_Control *_Thread_queue_Do_dequeue( &queue_context ); } else { - _Thread_queue_Release( the_thread_queue, &queue_context.Lock_context ); + _Thread_queue_Release( the_thread_queue, &queue_context ); } return the_thread; diff --git a/cpukit/score/src/threadqfirst.c b/cpukit/score/src/threadqfirst.c index 790ea8c59f..0828c1f717 100644 --- a/cpukit/score/src/threadqfirst.c +++ b/cpukit/score/src/threadqfirst.c @@ -25,12 +25,12 @@ Thread_Control *_Thread_queue_First( const Thread_queue_Operations *operations ) { - Thread_Control *the_thread; - ISR_lock_Context lock_context; + Thread_Control *the_thread; + Thread_queue_Context queue_context; - _Thread_queue_Acquire( the_thread_queue, &lock_context ); + _Thread_queue_Acquire( the_thread_queue, &queue_context ); the_thread = _Thread_queue_First_locked( the_thread_queue, operations ); - _Thread_queue_Release( the_thread_queue, &lock_context ); + _Thread_queue_Release( the_thread_queue, &queue_context ); return the_thread; } diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c index 8e93d457e8..b7804a5af8 100644 --- a/cpukit/score/src/threadrestart.c +++ b/cpukit/score/src/threadrestart.c @@ -119,10 +119,7 @@ static void _Thread_Wake_up_joining_threads( Thread_Control *the_thread ) #endif _Thread_queue_Context_initialize( &join_context.Base ); - _Thread_queue_Acquire( - &the_thread->Join_queue, - &join_context.Base.Lock_context - ); + _Thread_queue_Acquire( &the_thread->Join_queue, &join_context.Base ); _Thread_queue_Flush_critical( &the_thread->Join_queue.Queue, THREAD_JOIN_TQ_OPERATIONS, |