Changeset a26603d in rtems

Timestamp:

12/01/95 21:06:53 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

4250c8b

Parents:

3837215d

Message:

Changed code for exit from synchronization state to a switch on the
possible synchronization actions. This should have made it harder to
avoid a case.

Files:

• c/src/exec/rtems/src/event.c (modified) (1 diff)
• cpukit/rtems/src/event.c (modified) (1 diff)

c/src/exec/rtems/src/event.c

@@ -197 +197 @@
 
   _ISR_Disable( level );
-  if ( _Event_Sync == TRUE ) {
-    _Event_Sync = FALSE;
-    _ISR_Enable( level );
-    return;
-  }
-  if ( _Event_Sync_state == EVENT_SYNC_TIMEOUT )
-    executing->Wait.return_code = RTEMS_TIMEOUT;
-  _ISR_Enable( level );
-  if ( ticks )
-    (void) _Watchdog_Remove( &executing->Timer );
-  _Thread_Unblock( executing );
-  return;
+  switch ( _Event_Sync_state ) {
+    case EVENT_SYNC_NOTHING_HAPPENED:
+      _Event_Sync = FALSE;
+      _ISR_Enable( level );
+      return;
+    case EVENT_SYNC_TIMEOUT:
+      executing->Wait.return_code = RTEMS_TIMEOUT;
+      _ISR_Enable( level );
+      _Thread_Unblock( executing );
+      return;
+    case EVENT_SYNC_SATISFIED:
+      if ( _Watchdog_Is_active( &executing->Timer ) ) {
+        _Watchdog_Deactivate( &executing->Timer );
+        _ISR_Enable( level );
+        (void) _Watchdog_Remove( &executing->Timer );
+      } else
+        _ISR_Enable( level );
+      _Thread_Unblock( executing );
+      return;
+  }
 }
 

cpukit/rtems/src/event.c

@@ -197 +197 @@
 
   _ISR_Disable( level );
-  if ( _Event_Sync == TRUE ) {
-    _Event_Sync = FALSE;
-    _ISR_Enable( level );
-    return;
-  }
-  if ( _Event_Sync_state == EVENT_SYNC_TIMEOUT )
-    executing->Wait.return_code = RTEMS_TIMEOUT;
-  _ISR_Enable( level );
-  if ( ticks )
-    (void) _Watchdog_Remove( &executing->Timer );
-  _Thread_Unblock( executing );
-  return;
+  switch ( _Event_Sync_state ) {
+    case EVENT_SYNC_NOTHING_HAPPENED:
+      _Event_Sync = FALSE;
+      _ISR_Enable( level );
+      return;
+    case EVENT_SYNC_TIMEOUT:
+      executing->Wait.return_code = RTEMS_TIMEOUT;
+      _ISR_Enable( level );
+      _Thread_Unblock( executing );
+      return;
+    case EVENT_SYNC_SATISFIED:
+      if ( _Watchdog_Is_active( &executing->Timer ) ) {
+        _Watchdog_Deactivate( &executing->Timer );
+        _ISR_Enable( level );
+        (void) _Watchdog_Remove( &executing->Timer );
+      } else
+        _ISR_Enable( level );
+      _Thread_Unblock( executing );
+      return;
+  }
 }