Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com>

Browse Source 
PR 1855/cpukit
	* posix/src/psignal.c, posix/src/psignalunblockthread.c,
	posix/src/pthread.c, posix/src/pthreadjoin.c: Correct signal
	processing during pthread_join. We are supposed to unblock the thread
	waiting on a pthread_join(), dispatch the signal handler, account for
	it potentially overwriting errno, and then have the thread return to
	blocking within pthread_join().
This commit is contained in:
Joel Sherrill
2011-07-31 22:40:43 +00:00
parent 0126591e0a
commit 426eb35f03
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/ChangeLog
View File

@@ -1,3 +1,13 @@
2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1855/cpukit
* posix/src/psignal.c, posix/src/psignalunblockthread.c,
posix/src/pthread.c, posix/src/pthreadjoin.c: Correct signal
processing during pthread_join. We are supposed to unblock the thread
waiting on a pthread_join(), dispatch the signal handler, account for
it potentially overwriting errno, and then have the thread return to
blocking within pthread_join().
2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1867/cpukit

9
cpukit/posix/src/psignal.c
View File

@@ -113,9 +113,16 @@ void _POSIX_signals_Post_switch_extension(
POSIX_API_Control *api;
int signo;
ISR_Level level;
int hold_errno;
api = the_thread->API_Extensions[ THREAD_API_POSIX ];
/*
* We need to ensure that if the signal handler executes a call
* which overwrites the unblocking status, we restore it.
*/
hold_errno = _Thread_Executing->Wait.return_code;
/*
* api may be NULL in case of a thread close in progress
*/
@@ -150,6 +157,8 @@ void _POSIX_signals_Post_switch_extension(
_POSIX_signals_Check_signal( api, signo, true );
}
}
_Thread_Executing->Wait.return_code = hold_errno;
}
/*PAGE

27
cpukit/posix/src/psignalunblockthread.c
View File

@@ -1,5 +1,5 @@
/*
* COPYRIGHT (c) 1989-2007.
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -100,24 +100,19 @@ bool _POSIX_signals_Unblock_thread(
the_thread->do_post_task_switch_extension = true;
if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) {
if ( _States_Is_interruptible_by_signal( the_thread->current_state ) ) {
the_thread->Wait.return_code = EINTR;
/*
* At this time, there is no RTEMS API object which lets a task
* block on a thread queue and be interruptible by a POSIX signal.
* If an object class with that requirement is ever added, enable
* this code.
* In pthread_cond_wait, a thread will be blocking on a thread
* queue, but is also interruptible by a POSIX signal.
*/
#if 0
if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) )
_Thread_queue_Extract_with_proxy( the_thread );
else
#endif
if ( _States_Is_delaying(the_thread->current_state) ){
if ( _Watchdog_Is_active( &the_thread->Timer ) )
(void) _Watchdog_Remove( &the_thread->Timer );
_Thread_Unblock( the_thread );
}
if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) )
_Thread_queue_Extract_with_proxy( the_thread );
else if ( _States_Is_delaying(the_thread->current_state) ){
(void) _Watchdog_Remove( &the_thread->Timer );
_Thread_Unblock( the_thread );
}
} else if ( the_thread->current_state == STATES_READY ) {
if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
_ISR_Signals_to_thread_executing = true;

2
cpukit/posix/src/pthread.c
View File

@@ -214,7 +214,7 @@ bool _POSIX_Threads_Create_extension(
_Thread_queue_Initialize(
&api->Join_List,
THREAD_QUEUE_DISCIPLINE_FIFO,
STATES_WAITING_FOR_JOIN_AT_EXIT,
STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_INTERRUPTIBLE_BY_SIGNAL,
0
);

6
cpukit/posix/src/pthreadjoin.c
View File

@@ -1,7 +1,7 @@
/*
* 16.1.3 Wait for Thread Termination, P1003.1c/Draft 10, p. 147
*
* COPYRIGHT (c) 1989-2007.
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
@@ -32,6 +32,7 @@ int pthread_join(
Objects_Locations location;
void *return_pointer;
on_EINTR:
the_thread = _Thread_Get( thread, &location );
switch ( location ) {
@@ -66,6 +67,9 @@ int pthread_join(
}
_Thread_Enable_dispatch();
if ( _Thread_Executing->Wait.return_code == EINTR )
goto on_EINTR;
if ( value_ptr )
*value_ptr = return_pointer;
return 0;