diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-29 17:49:30 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-29 17:49:30 +0000 |
| commit | 53eafcb0d2e826e9e9c3ba88e90fa9fa69655a1d (patch) | |
| tree | 8eec0da877c33daae3a00936bf67861016014d75 /cpukit/posix | |
| parent | 2010-07-29 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-53eafcb0d2e826e9e9c3ba88e90fa9fa69655a1d.tar.bz2 | |
2010-07-29 Joel Sherrill <joel.sherrilL@OARcorp.com>
* posix/src/psignalunblockthread.c: Clean up and simplify.
Diffstat (limited to 'cpukit/posix')
| -rw-r--r-- | cpukit/posix/src/psignalunblockthread.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c index 4b08a4eea3..00ac214404 100644 --- a/cpukit/posix/src/psignalunblockthread.c +++ b/cpukit/posix/src/psignalunblockthread.c @@ -98,7 +98,7 @@ bool _POSIX_signals_Unblock_thread( * + Any other combination, do nothing. */ - 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; /* * In pthread_cond_wait, a thread will be blocking on a thread @@ -106,9 +106,8 @@ bool _POSIX_signals_Unblock_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) ){ - if ( _Watchdog_Is_active( &the_thread->Timer ) ) - (void) _Watchdog_Remove( &the_thread->Timer ); + else if ( _States_Is_delaying(the_thread->current_state) ) { + (void) _Watchdog_Remove( &the_thread->Timer ); _Thread_Unblock( the_thread ); } |