diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-08-22 10:58:34 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-08 09:55:27 +0200 |
| commit | e41308eab8ae4505844d8e499664424f8c7f2bd1 (patch) | |
| tree | 7dffe5edacd3f245ba5ef3b64b431b7e4c74c454 /cpukit/posix/src/pthreadjoin.c | |
| parent | score: Simplify thread queue acquire/release (diff) | |
| download | rtems-e41308eab8ae4505844d8e499664424f8c7f2bd1.tar.bz2 | |
score: Introduce Thread_queue_Lock_context
Introduce Thread_queue_Lock_context to contain the context necessary for
thread queue lock and thread wait lock acquire/release operations to
reduce the Thread_Control size.
Diffstat (limited to 'cpukit/posix/src/pthreadjoin.c')
| -rw-r--r-- | cpukit/posix/src/pthreadjoin.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 641031c20d..5ed01185f1 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -41,7 +41,7 @@ static int _POSIX_Threads_Join( pthread_t thread, void **value_ptr ) _Thread_queue_Context_initialize( &queue_context ); _Thread_queue_Context_set_expected_level( &queue_context, 1 ); _Thread_queue_Context_set_no_timeout( &queue_context ); - the_thread = _Thread_Get( thread, &queue_context.Lock_context ); + the_thread = _Thread_Get( thread, &queue_context.Lock_context.Lock_context ); if ( the_thread == NULL ) { return ESRCH; @@ -51,22 +51,28 @@ static int _POSIX_Threads_Join( pthread_t thread, void **value_ptr ) executing = _Per_CPU_Get_executing( cpu_self ); if ( executing == the_thread ) { - _ISR_lock_ISR_enable( &queue_context.Lock_context ); + _ISR_lock_ISR_enable( &queue_context.Lock_context.Lock_context ); return EDEADLK; } - _Thread_State_acquire_critical( the_thread, &queue_context.Lock_context ); + _Thread_State_acquire_critical( + the_thread, + &queue_context.Lock_context.Lock_context + ); if ( !_Thread_Is_joinable( the_thread ) ) { - _Thread_State_release( the_thread, &queue_context.Lock_context ); + _Thread_State_release( the_thread, &queue_context.Lock_context.Lock_context ); return EINVAL; } if ( _States_Is_waiting_for_join_at_exit( the_thread->current_state ) ) { value = the_thread->Life.exit_value; _Thread_Clear_state_locked( the_thread, STATES_WAITING_FOR_JOIN_AT_EXIT ); - _Thread_Dispatch_disable_with_CPU( cpu_self, &queue_context.Lock_context ); - _Thread_State_release( the_thread, &queue_context.Lock_context ); + _Thread_Dispatch_disable_with_CPU( + cpu_self, + &queue_context.Lock_context.Lock_context + ); + _Thread_State_release( the_thread, &queue_context.Lock_context.Lock_context ); _Thread_Dispatch_enable( cpu_self ); } else { _Thread_Join( |