diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-21 23:09:07 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-21 23:09:07 +0000 |
commit | 4b45c1393ce4ee3e1c2762ef3145d2bd6b5b38da (patch) | |
tree | 4166e0d1b92b95716888ca2f8205afd34503f1e0 | |
parent | 2009-07-21 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-4b45c1393ce4ee3e1c2762ef3145d2bd6b5b38da.tar.bz2 |
2009-07-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/src/eventseize.c, rtems/src/eventsurrender.c,
rtems/src/eventtimeout.c: Clean up and minor rework as a side-effect
of coverage analysis.
-rw-r--r-- | cpukit/ChangeLog | 6 | ||||
-rw-r--r-- | cpukit/rtems/src/eventseize.c | 12 | ||||
-rw-r--r-- | cpukit/rtems/src/eventsurrender.c | 4 | ||||
-rw-r--r-- | cpukit/rtems/src/eventtimeout.c | 19 |
4 files changed, 26 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 7cb173f974..acfdea1faf 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2009-07-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * rtems/src/eventseize.c, rtems/src/eventsurrender.c, + rtems/src/eventtimeout.c: Clean up and minor rework as a side-effect + of coverage analysis. + +2009-07-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * sapi/src/debug.c, score/include/rtems/debug.h: Rename _Debug_Is_enabled to rtems_is_debug_enabled. diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c index 9abb54fa6a..0b6bf2d623 100644 --- a/cpukit/rtems/src/eventseize.c +++ b/cpukit/rtems/src/eventseize.c @@ -86,12 +86,20 @@ void _Event_Seize( return; } - _Event_Sync_state = THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED; - + /* + * Note what we are waiting for BEFORE we enter the critical section. + * The interrupt critical section management code needs this to be + * set properly when we are marked as in the event critical section. + * + * NOTE: Since interrupts are disabled, this isn't that much of an + * issue but better safe than sorry. + */ executing->Wait.option = (uint32_t) option_set; executing->Wait.count = (uint32_t) event_in; executing->Wait.return_argument = event_out; + _Event_Sync_state = THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED; + _ISR_Enable( level ); if ( ticks ) { diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c index ad01f15dc0..904a7e2b07 100644 --- a/cpukit/rtems/src/eventsurrender.c +++ b/cpukit/rtems/src/eventsurrender.c @@ -77,8 +77,8 @@ void _Event_Surrender( */ if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) && - ((_Event_Sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) || - (_Event_Sync_state == THREAD_BLOCKING_OPERATION_TIMEOUT)) ) { + ((_Event_Sync_state == THREAD_BLOCKING_OPERATION_TIMEOUT) || + (_Event_Sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED)) ) { if ( seized_events == event_condition || _Options_Is_any(option_set) ) { api->pending_events = _Event_sets_Clear( pending_events,seized_events ); the_thread->Wait.count = 0; diff --git a/cpukit/rtems/src/eventtimeout.c b/cpukit/rtems/src/eventtimeout.c index 04abe71766..c1eef71f9e 100644 --- a/cpukit/rtems/src/eventtimeout.c +++ b/cpukit/rtems/src/eventtimeout.c @@ -63,22 +63,19 @@ void _Event_Timeout( * this is the "timeout" transition. After a request is satisfied, * a timeout is not allowed to occur. */ - - _ISR_Disable( level ); - if ( !the_thread->Wait.count ) { /* verify thread is waiting */ - _Thread_Unnest_dispatch(); - _ISR_Enable( level ); - return; - } + #if defined(RTEMS_DEBUG) + if ( !the_thread->Wait.count ) { /* verify thread is waiting */ + _Thread_Unnest_dispatch(); + _ISR_Enable( level ); + return; + } + #endif the_thread->Wait.count = 0; if ( _Thread_Is_executing( the_thread ) ) { - Thread_blocking_operation_States sync = _Event_Sync_state; - if ( (sync == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) || - (sync == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) { + if ( _Event_Sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED ) _Event_Sync_state = THREAD_BLOCKING_OPERATION_TIMEOUT; - } } the_thread->Wait.return_code = RTEMS_TIMEOUT; |