Changeset 4f60309b in rtems

Timestamp:

02/01/96 22:09:07 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

d57392d

Parents:

f00a0522

Message:

Swapped order of nested acquisition check and check for returning unsatisfied.

Files:

• c/src/exec/score/src/coremutex.c (modified) (2 diffs)
• cpukit/score/src/coremutex.c (modified) (2 diffs)

c/src/exec/score/src/coremutex.c

@@ -123 +123 @@
   }
 
-  if ( !wait ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
-    return;
-  }
-
   if ( _Objects_Are_ids_equal(
               _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
@@ -137 +131 @@
 
     _ISR_Enable( level );
+    return;
+  }
+
+  if ( !wait ) {
+    _ISR_Enable( level );
+    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
     return;
   }

cpukit/score/src/coremutex.c

@@ -123 +123 @@
   }
 
-  if ( !wait ) {
-    _ISR_Enable( level );
-    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
-    return;
-  }
-
   if ( _Objects_Are_ids_equal(
               _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
@@ -137 +131 @@
 
     _ISR_Enable( level );
+    return;
+  }
+
+  if ( !wait ) {
+    _ISR_Enable( level );
+    executing->Wait.return_code = CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
     return;
   }