Changeset cc757fe in rtems

Timestamp:

08/07/96 20:57:28 (27 years ago)

Author:

Mark Johannes <Mark.Johannes@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a14684c3

Parents:

c123a084

Message:

_CORE_Mutex_seize: added checks for priority ceiling violation, also added

checks to ensure priority was not lowered.

Files:

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

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

@@ -111 +111 @@
 
   executing = _Thread_Executing;
+  switch ( the_mutex->Attributes.discipline ) {
+    case CORE_MUTEX_DISCIPLINES_FIFO:
+    case CORE_MUTEX_DISCIPLINES_PRIORITY:
+    case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+      break;
+    case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+      if ( executing->current_priority <
+                              the_mutex->Attributes.priority_ceiling) {
+        executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED;
+        return;
+      }
+  }
   executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
   _ISR_Disable( level );
@@ -124 +136 @@
       case CORE_MUTEX_DISCIPLINES_PRIORITY:
       case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+        /* already the highest priority */
         break;
       case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+      if ( the_mutex->Attributes.priority_ceiling <
+                                           executing->current_priority ) {
         _Thread_Change_priority(
-          executing,
+          the_mutex->holder,
           the_mutex->Attributes.priority_ceiling
         );
-        break;
+      }
     }
     return;
@@ -181 +196 @@
         break;
       case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-        _Thread_Change_priority(
-          executing,
-          the_mutex->Attributes.priority_ceiling
-        );
+        if ( the_mutex->Attributes.priority_ceiling <
+                                           executing->current_priority ) {
+          _Thread_Change_priority(
+            executing,
+            the_mutex->Attributes.priority_ceiling
+          );
+        };
         break;
     }

cpukit/score/src/coremutex.c

@@ -111 +111 @@
 
   executing = _Thread_Executing;
+  switch ( the_mutex->Attributes.discipline ) {
+    case CORE_MUTEX_DISCIPLINES_FIFO:
+    case CORE_MUTEX_DISCIPLINES_PRIORITY:
+    case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+      break;
+    case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+      if ( executing->current_priority <
+                              the_mutex->Attributes.priority_ceiling) {
+        executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED;
+        return;
+      }
+  }
   executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
   _ISR_Disable( level );
@@ -124 +136 @@
       case CORE_MUTEX_DISCIPLINES_PRIORITY:
       case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+        /* already the highest priority */
         break;
       case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+      if ( the_mutex->Attributes.priority_ceiling <
+                                           executing->current_priority ) {
         _Thread_Change_priority(
-          executing,
+          the_mutex->holder,
           the_mutex->Attributes.priority_ceiling
         );
-        break;
+      }
     }
     return;
@@ -181 +196 @@
         break;
       case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-        _Thread_Change_priority(
-          executing,
-          the_mutex->Attributes.priority_ceiling
-        );
+        if ( the_mutex->Attributes.priority_ceiling <
+                                           executing->current_priority ) {
+          _Thread_Change_priority(
+            executing,
+            the_mutex->Attributes.priority_ceiling
+          );
+        };
         break;
     }