diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-05 18:13:18 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-07-05 18:13:18 +0000 |
| commit | f845e96e7beef7d6db35c80e0075dcb07a71dce3 (patch) | |
| tree | 20e8b5d161afe8cff844b85b0b45611f8611f9c7 /cpukit/posix/src/testcancel.c | |
| parent | 2002-07-05 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-f845e96e7beef7d6db35c80e0075dcb07a71dce3.tar.bz2 | |
2002-07-05 Joel Sherrill <joel@OARcorp.com>
* include/rtems/posix/cancel.h, src/cancel.c, src/cancelrun.c,
src/mqueue.c, src/pthread.c, src/semaphore.c, src/setcancelstate.c,
src/setcanceltype.c, src/testcancel.c: Per PR164, corrected the
behavior of thread cancellation and did some cleanup as a side-effect.
Diffstat (limited to 'cpukit/posix/src/testcancel.c')
| -rw-r--r-- | cpukit/posix/src/testcancel.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/cpukit/posix/src/testcancel.c b/cpukit/posix/src/testcancel.c index b4007526de..08a423747f 100644 --- a/cpukit/posix/src/testcancel.c +++ b/cpukit/posix/src/testcancel.c @@ -27,9 +27,20 @@ void pthread_testcancel( void ) { POSIX_API_Control *thread_support; + /* + * Don't even think about deleting a resource from an ISR. + * Besides this request is supposed to be for _Thread_Executing + * and the ISR context is not a thread. + */ + + if ( _ISR_Is_in_progress() ) + return; + thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ]; - if ( thread_support->cancelability_state == PTHREAD_CANCEL_ENABLE && - thread_support->cancelation_requested ) - _POSIX_Thread_cancel_run( _Thread_Executing ); + _Thread_Disable_dispatch(); + if ( thread_support->cancelability_state == PTHREAD_CANCEL_ENABLE && + thread_support->cancelation_requested ) + _POSIX_Threads_cancel_run( _Thread_Executing ); + _Thread_Enable_dispatch(); } |