Changeset 8f0529f in rtems

Timestamp:

11/02/99 15:58:09 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

2cd5444

Parents:

9693fdac

Message:

Added maximum count detection logic.

Files:

• c/src/exec/score/include/rtems/score/coresem.h (modified) (2 diffs)
• c/src/exec/score/src/coresem.c (modified) (2 diffs)
• cpukit/score/include/rtems/score/coresem.h (modified) (2 diffs)
• cpukit/score/src/coresem.c (modified) (2 diffs)

c/src/exec/score/include/rtems/score/coresem.h

@@ -56 +56 @@
   CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT,
   CORE_SEMAPHORE_WAS_DELETED,
-  CORE_SEMAPHORE_TIMEOUT
+  CORE_SEMAPHORE_TIMEOUT,
+  CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED
 }   CORE_semaphore_Status;
 
@@ -65 +66 @@
 
 typedef struct {
+  unsigned32                  maximum_count;
   CORE_semaphore_Disciplines  discipline;
 }   CORE_semaphore_Attributes;

c/src/exec/score/src/coresem.c

@@ -92 +92 @@
 {
   Thread_Control *the_thread;
+  ISR_Level       level;
+  CORE_semaphore_Status status;
+
+  status = CORE_SEMAPHORE_STATUS_SUCCESSFUL;
 
   if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) {
@@ -98 +102 @@
       (*api_semaphore_mp_support) ( the_thread, id );
 
-  } else
-    the_semaphore->count += 1;
+  } else {
+    _ISR_Disable( level );
+      if ( the_semaphore->count <= the_semaphore->Attributes.maximum_count )
+        the_semaphore->count += 1;
+      else
+        status = CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED;
+    _ISR_Enable( level );
+  }
 
-  return( CORE_SEMAPHORE_STATUS_SUCCESSFUL );
+  return status;
 }
 

cpukit/score/include/rtems/score/coresem.h

@@ -56 +56 @@
   CORE_SEMAPHORE_STATUS_UNSATISFIED_NOWAIT,
   CORE_SEMAPHORE_WAS_DELETED,
-  CORE_SEMAPHORE_TIMEOUT
+  CORE_SEMAPHORE_TIMEOUT,
+  CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED
 }   CORE_semaphore_Status;
 
@@ -65 +66 @@
 
 typedef struct {
+  unsigned32                  maximum_count;
   CORE_semaphore_Disciplines  discipline;
 }   CORE_semaphore_Attributes;

cpukit/score/src/coresem.c

@@ -92 +92 @@
 {
   Thread_Control *the_thread;
+  ISR_Level       level;
+  CORE_semaphore_Status status;
+
+  status = CORE_SEMAPHORE_STATUS_SUCCESSFUL;
 
   if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) {
@@ -98 +102 @@
       (*api_semaphore_mp_support) ( the_thread, id );
 
-  } else
-    the_semaphore->count += 1;
+  } else {
+    _ISR_Disable( level );
+      if ( the_semaphore->count <= the_semaphore->Attributes.maximum_count )
+        the_semaphore->count += 1;
+      else
+        status = CORE_SEMAPHORE_MAXIMUM_COUNT_EXCEEDED;
+    _ISR_Enable( level );
+  }
 
-  return( CORE_SEMAPHORE_STATUS_SUCCESSFUL );
+  return status;
 }