Changeset 7d91d72 in rtems

Timestamp:

12/13/99 15:29:20 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

d16faa2

Parents:

e9067989

Message:

First attempt at adding simple binary semaphore in addition to the current
"mutex" and counting semaphore. This is at the request of Eric Norum
and his EPICS porting effort.

Files:

• c/src/exec/rtems/include/rtems/rtems/attr.h (modified) (1 diff)
• c/src/exec/rtems/inline/rtems/rtems/attr.inl (modified) (1 diff)
• c/src/exec/rtems/macros/rtems/rtems/attr.inl (modified) (1 diff)
• c/src/exec/rtems/src/semcreate.c (modified) (1 diff)
• c/src/exec/rtems/src/semtranslatereturncode.c (modified) (1 diff)
• c/src/exec/score/src/coremutexseize.c (modified) (1 diff)
• c/src/exec/score/src/coremutexsurrender.c (modified) (1 diff)
• c/src/tests/sptests/Makefile.am (modified) (1 diff)
• c/src/tests/sptests/configure.in (modified) (1 diff)
• c/src/tests/sptests/sp29/Makefile.am (added)
• c/src/tests/sptests/sp29/init.c (added)
• c/src/tests/sptests/sp29/sp29.doc (added)
• c/src/tests/sptests/sp29/sp29.scn (added)
• cpukit/rtems/include/rtems/rtems/attr.h (modified) (1 diff)
• cpukit/rtems/inline/rtems/rtems/attr.inl (modified) (1 diff)
• cpukit/rtems/macros/rtems/rtems/attr.inl (modified) (1 diff)
• cpukit/rtems/src/semcreate.c (modified) (1 diff)
• cpukit/rtems/src/semtranslatereturncode.c (modified) (1 diff)
• cpukit/score/src/coremutexseize.c (modified) (1 diff)
• cpukit/score/src/coremutexsurrender.c (modified) (1 diff)
• testsuites/sptests/Makefile.am (modified) (1 diff)
• testsuites/sptests/sp29/Makefile.am (added)
• testsuites/sptests/sp29/init.c (added)
• testsuites/sptests/sp29/sp29.doc (added)
• testsuites/sptests/sp29/sp29.scn (added)

c/src/exec/rtems/include/rtems/rtems/attr.h

@@ -47 +47 @@
 #define RTEMS_PRIORITY_CEILING    0x00000040
 
+#define RTEMS_NESTING_ALLOWED     0x00000000
+#define RTEMS_NO_NESTING_ALLOWED  0x00000080
+
 #define RTEMS_APPLICATION_TASK    0x00000000
-#define RTEMS_SYSTEM_TASK         0x00000080
+#define RTEMS_SYSTEM_TASK         0x00000100
+
 
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )

c/src/exec/rtems/inline/rtems/rtems/attr.inl

@@ -159 +159 @@
 /*PAGE
  *
+ *  _Attributes_Is_nesting_allowed
+ *
+ *  DESCRIPTION:
+ *
+ *  This function returns TRUE if the nesting allowed attribute
+ *  is enabled in the attribute_set and FALSE otherwise.
+ */
+ 
+RTEMS_INLINE_ROUTINE boolean _Attributes_Is_nesting_allowed(
+  rtems_attribute attribute_set
+)
+{
+   return ( !(attribute_set & RTEMS_NO_NESTING_ALLOWED) );
+}
+
+/*PAGE
+ *
  *  _Attributes_Is_system_task
  *

c/src/exec/rtems/macros/rtems/rtems/attr.inl

@@ -91 +91 @@
 /*PAGE
  *
+ *  _Attributes_Is_nesting_allowed
+ *
+ */
+
+#define _Attributes_Is_nesting_allowed( _attribute_set ) \
+   ( !((_attribute_set) & RTEMS_NO_NESTING_ALLOWED) )
+
+/*PAGE
+ *
  *  _Attributes_Is_system_task
  *

c/src/exec/rtems/src/semcreate.c

@@ -130 +130 @@
     if ( _Attributes_Is_inherit_priority( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-    else if (_Attributes_Is_priority_ceiling( attribute_set ) )
+    else if ( _Attributes_Is_priority_ceiling( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-    else if (_Attributes_Is_priority( attribute_set ) )
+    else if ( _Attributes_Is_priority( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY;
     else
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_FIFO;
 
-    the_mutex_attributes.allow_nesting = TRUE;
+    if ( _Attributes_Is_nesting_allowed( attribute_set ) )
+      the_mutex_attributes.allow_nesting = TRUE;
+    else
+      the_mutex_attributes.allow_nesting = FALSE;
 
     /* Add priority ceiling code here ????? */

c/src/exec/rtems/src/semtranslatereturncode.c

@@ -68 +68 @@
       return RTEMS_UNSATISFIED;
     case CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED:
-      return RTEMS_INTERNAL_ERROR;
+      return RTEMS_UNSATISFIED;
     case CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE:
       return RTEMS_NOT_OWNER_OF_RESOURCE;

c/src/exec/score/src/coremutexseize.c

@@ -91 +91 @@
       }
     }
+    executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
     return;
   }

c/src/exec/score/src/coremutexsurrender.c

@@ -62 +62 @@
    */ 
 
-  if ( !_Objects_Are_ids_equal(
-           _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
-
-    switch ( the_mutex->Attributes.discipline ) {
-      case CORE_MUTEX_DISCIPLINES_FIFO:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY:
-        break;
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-        return( CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE );
-        break;
+  if ( the_mutex->Attributes.allow_nesting ) {
+    if ( !_Objects_Are_ids_equal(
+             _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
+  
+      switch ( the_mutex->Attributes.discipline ) {
+        case CORE_MUTEX_DISCIPLINES_FIFO:
+        case CORE_MUTEX_DISCIPLINES_PRIORITY:
+          break;
+        case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+        case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+          return( CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE );
+          break;
+      }
     }
   }
+
+  /* XXX already unlocked -- not right status */
+
+  if ( !the_mutex->nest_count ) 
+    return( CORE_MUTEX_STATUS_SUCCESSFUL );
 
   the_mutex->nest_count--;
 
   if ( the_mutex->nest_count != 0 )
-    return( CORE_MUTEX_STATUS_SUCCESSFUL );
+    return( CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED );
 
   _Thread_Executing->resource_count--;

c/src/tests/sptests/Makefile.am

@@ -8 +8 @@
 ## sp10 and spfatal are not included for now
 SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \
-    sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 spsize
+    sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \
+    spsize
 
 EXTRA_DIST = sptests.am spfatal

c/src/tests/sptests/configure.in

@@ -67 +67 @@
 sp27/Makefile
 sp28/Makefile
+sp29/Makefile
 spsize/Makefile
 )

cpukit/rtems/include/rtems/rtems/attr.h

@@ -47 +47 @@
 #define RTEMS_PRIORITY_CEILING    0x00000040
 
+#define RTEMS_NESTING_ALLOWED     0x00000000
+#define RTEMS_NO_NESTING_ALLOWED  0x00000080
+
 #define RTEMS_APPLICATION_TASK    0x00000000
-#define RTEMS_SYSTEM_TASK         0x00000080
+#define RTEMS_SYSTEM_TASK         0x00000100
+
 
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )

cpukit/rtems/inline/rtems/rtems/attr.inl

@@ -159 +159 @@
 /*PAGE
  *
+ *  _Attributes_Is_nesting_allowed
+ *
+ *  DESCRIPTION:
+ *
+ *  This function returns TRUE if the nesting allowed attribute
+ *  is enabled in the attribute_set and FALSE otherwise.
+ */
+ 
+RTEMS_INLINE_ROUTINE boolean _Attributes_Is_nesting_allowed(
+  rtems_attribute attribute_set
+)
+{
+   return ( !(attribute_set & RTEMS_NO_NESTING_ALLOWED) );
+}
+
+/*PAGE
+ *
  *  _Attributes_Is_system_task
  *

cpukit/rtems/macros/rtems/rtems/attr.inl

@@ -91 +91 @@
 /*PAGE
  *
+ *  _Attributes_Is_nesting_allowed
+ *
+ */
+
+#define _Attributes_Is_nesting_allowed( _attribute_set ) \
+   ( !((_attribute_set) & RTEMS_NO_NESTING_ALLOWED) )
+
+/*PAGE
+ *
  *  _Attributes_Is_system_task
  *

cpukit/rtems/src/semcreate.c

@@ -130 +130 @@
     if ( _Attributes_Is_inherit_priority( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT;
-    else if (_Attributes_Is_priority_ceiling( attribute_set ) )
+    else if ( _Attributes_Is_priority_ceiling( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING;
-    else if (_Attributes_Is_priority( attribute_set ) )
+    else if ( _Attributes_Is_priority( attribute_set ) )
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_PRIORITY;
     else
       the_mutex_attributes.discipline = CORE_MUTEX_DISCIPLINES_FIFO;
 
-    the_mutex_attributes.allow_nesting = TRUE;
+    if ( _Attributes_Is_nesting_allowed( attribute_set ) )
+      the_mutex_attributes.allow_nesting = TRUE;
+    else
+      the_mutex_attributes.allow_nesting = FALSE;
 
     /* Add priority ceiling code here ????? */

cpukit/rtems/src/semtranslatereturncode.c

@@ -68 +68 @@
       return RTEMS_UNSATISFIED;
     case CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED:
-      return RTEMS_INTERNAL_ERROR;
+      return RTEMS_UNSATISFIED;
     case CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE:
       return RTEMS_NOT_OWNER_OF_RESOURCE;

cpukit/score/src/coremutexseize.c

@@ -91 +91 @@
       }
     }
+    executing->Wait.return_code = CORE_MUTEX_STATUS_SUCCESSFUL;
     return;
   }

cpukit/score/src/coremutexsurrender.c

@@ -62 +62 @@
    */ 
 
-  if ( !_Objects_Are_ids_equal(
-           _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
-
-    switch ( the_mutex->Attributes.discipline ) {
-      case CORE_MUTEX_DISCIPLINES_FIFO:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY:
-        break;
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
-      case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
-        return( CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE );
-        break;
+  if ( the_mutex->Attributes.allow_nesting ) {
+    if ( !_Objects_Are_ids_equal(
+             _Thread_Executing->Object.id, the_mutex->holder_id ) ) {
+  
+      switch ( the_mutex->Attributes.discipline ) {
+        case CORE_MUTEX_DISCIPLINES_FIFO:
+        case CORE_MUTEX_DISCIPLINES_PRIORITY:
+          break;
+        case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING:
+        case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT:
+          return( CORE_MUTEX_STATUS_NOT_OWNER_OF_RESOURCE );
+          break;
+      }
     }
   }
+
+  /* XXX already unlocked -- not right status */
+
+  if ( !the_mutex->nest_count ) 
+    return( CORE_MUTEX_STATUS_SUCCESSFUL );
 
   the_mutex->nest_count--;
 
   if ( the_mutex->nest_count != 0 )
-    return( CORE_MUTEX_STATUS_SUCCESSFUL );
+    return( CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED );
 
   _Thread_Executing->resource_count--;

testsuites/sptests/Makefile.am

@@ -8 +8 @@
 ## sp10 and spfatal are not included for now
 SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \
-    sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 spsize
+    sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \
+    spsize
 
 EXTRA_DIST = sptests.am spfatal