diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-13 08:16:30 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-20 07:49:39 +0200 |
| commit | 54550e048d3a49435912797d2024f80671e93267 (patch) | |
| tree | bf49901187d98cf6a71975bdef7038d3ae0988c2 /cpukit/posix/src/pthreadexit.c | |
| parent | score: Simplify _Thread_Life_action_handler() (diff) | |
| download | rtems-54550e048d3a49435912797d2024f80671e93267.tar.bz2 | |
posix: Rework pthread_join()
Rework pthread_join() to use _Thread_Join().
Close #2402.
Update #2555.
Update #2626.
Close #2714.
Diffstat (limited to 'cpukit/posix/src/pthreadexit.c')
| -rw-r--r-- | cpukit/posix/src/pthreadexit.c | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/cpukit/posix/src/pthreadexit.c b/cpukit/posix/src/pthreadexit.c index 559e37cc41..3c4d3ebaaf 100644 --- a/cpukit/posix/src/pthreadexit.c +++ b/cpukit/posix/src/pthreadexit.c @@ -31,47 +31,24 @@ void _POSIX_Thread_Exit( void *value_ptr ) { - Thread_Control *executing; - Thread_Control *unblocked; - POSIX_API_Control *api; - - api = the_thread->API_Extensions[ THREAD_API_POSIX ]; + Thread_Control *executing; + Per_CPU_Control *cpu_self; _Assert( _Debug_Is_thread_dispatching_allowed() ); - _Thread_Disable_dispatch(); - - the_thread->Wait.return_argument = value_ptr; - - /* - * Process join - */ - if ( api->detachstate == PTHREAD_CREATE_JOINABLE ) { - unblocked = _POSIX_Threads_Join_dequeue( api ); - if ( unblocked ) { - do { - *(void **)unblocked->Wait.return_argument = value_ptr; - } while ( ( unblocked = _POSIX_Threads_Join_dequeue( api ) ) ); - } else { - _Thread_Set_state( the_thread, STATES_WAITING_FOR_JOIN_AT_EXIT ); - _Thread_Enable_dispatch(); - /* now waiting for thread to arrive */ - _Thread_Disable_dispatch(); - } - } - - executing = _Thread_Executing; + cpu_self = _Thread_Dispatch_disable(); + executing = _Per_CPU_Get_executing( cpu_self ); /* * Now shut down the thread */ if ( the_thread == executing ) { - _Thread_Exit( executing ); + _Thread_Exit( executing, THREAD_LIFE_TERMINATING, value_ptr ); } else { - _Thread_Close( the_thread, executing ); + _Thread_Cancel( the_thread, executing, value_ptr ); } - _Thread_Enable_dispatch(); + _Thread_Dispatch_enable( cpu_self ); } void pthread_exit( |