diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-28 20:39:48 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-28 20:39:48 +0000 |
| commit | c838e2f437e92d76173d86402c74b73e847af88a (patch) | |
| tree | 9f809fc793b19e2eeca2a856e96a2ac7e36a425b /cpukit/posix/src/psignalunblockthread.c | |
| parent | 2010-07-27 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-c838e2f437e92d76173d86402c74b73e847af88a.tar.bz2 | |
2010-07-28 Vinu Rajashekhar <vinutheraj@gmail.com>
* posix/src/condinit.c, posix/src/condwaitsupp.c,
posix/src/psignalunblockthread.c: Clean up some signal interruption
code.
Diffstat (limited to 'cpukit/posix/src/psignalunblockthread.c')
| -rw-r--r-- | cpukit/posix/src/psignalunblockthread.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c index 912ac34694..4b08a4eea3 100644 --- a/cpukit/posix/src/psignalunblockthread.c +++ b/cpukit/posix/src/psignalunblockthread.c @@ -101,21 +101,17 @@ bool _POSIX_signals_Unblock_thread( if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) { 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) ){ + else 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 ); } + } else if ( the_thread->current_state == STATES_READY ) { if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) ) _Context_Switch_necessary = true; |