Changeset 9693fdac in rtems

Timestamp:

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

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

8f0529f

Parents:

af10d3ef

Message:

Added support for message priority as required by POSIX.

Files:

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

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

@@ -57 +57 @@
 typedef struct {
   Chain_Node                 Node;
+  int                        priority;
   CORE_message_queue_Buffer  Contents;
 }   CORE_message_queue_Buffer_control;
@@ -73 +74 @@
  *  may be submitted to a message queue.  The message may be posted
  *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  CORE_MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  CORE_message_queue_Submit_types;
+ *
+ *  NOTE:  All other values are message priorities.  Numerically smaller
+ *         priorities indicate higher priority messages.
+ *
+ *  XXX these constants should be changed to be compiler dependent.
+ */
+ 
+#define  CORE_MESSAGE_QUEUE_SEND_REQUEST   0x7fffffff
+#define  CORE_MESSAGE_QUEUE_URGENT_REQUEST -(0x7fffffff)
+
+typedef int CORE_message_queue_Submit_types;
 
 /*

c/src/exec/score/src/coremsg.c

@@ -423 +423 @@
   _CORE_message_queue_Copy_buffer( buffer, the_message->Contents.buffer, size );
   the_message->Contents.size = size;
-  
+  the_message->priority  = submit_type;
+
   the_message_queue->number_of_pending_messages += 1;
 
@@ -433 +434 @@
       _CORE_message_queue_Prepend( the_message_queue, the_message );
       break;
-  }
-
+    default:
+      /* XXX interrupt critical section needs to be addressed */
+      {
+        CORE_message_queue_Buffer_control *this_message;
+        Chain_Node                        *the_node;
+
+        the_message->priority = submit_type;
+        for ( the_node = the_message_queue->Pending_messages.first ;
+           !_Chain_Is_tail( &the_message_queue->Pending_messages, the_node ) ;
+           the_node = the_node->next ) {
+
+          this_message = (CORE_message_queue_Buffer_control *) the_node;
+
+          if ( this_message->priority >= the_message->priority )
+            continue;
+
+          _Chain_Insert( the_node, &the_message->Node );
+          break;
+        }
+      }
+      break;
+  }
+
+  /*
+   *  According to POSIX, does this happen before or after the message
+   *  is actually enqueued.  It is logical to think afterwards, because
+   *  the message is actually in the queue at this point.
+   */
+
+  if ( the_message_queue->number_of_pending_messages == 1 && 
+       the_message_queue->notify_handler )
+    (*the_message_queue->notify_handler)( the_message_queue->notify_argument );
+  
   return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
 }

cpukit/score/include/rtems/score/coremsg.h

@@ -57 +57 @@
 typedef struct {
   Chain_Node                 Node;
+  int                        priority;
   CORE_message_queue_Buffer  Contents;
 }   CORE_message_queue_Buffer_control;
@@ -73 +74 @@
  *  may be submitted to a message queue.  The message may be posted
  *  in a send or urgent fashion.
- */
- 
-typedef enum {
-  CORE_MESSAGE_QUEUE_SEND_REQUEST   = 0,
-  CORE_MESSAGE_QUEUE_URGENT_REQUEST = 1
-}  CORE_message_queue_Submit_types;
+ *
+ *  NOTE:  All other values are message priorities.  Numerically smaller
+ *         priorities indicate higher priority messages.
+ *
+ *  XXX these constants should be changed to be compiler dependent.
+ */
+ 
+#define  CORE_MESSAGE_QUEUE_SEND_REQUEST   0x7fffffff
+#define  CORE_MESSAGE_QUEUE_URGENT_REQUEST -(0x7fffffff)
+
+typedef int CORE_message_queue_Submit_types;
 
 /*

cpukit/score/src/coremsg.c

@@ -423 +423 @@
   _CORE_message_queue_Copy_buffer( buffer, the_message->Contents.buffer, size );
   the_message->Contents.size = size;
-  
+  the_message->priority  = submit_type;
+
   the_message_queue->number_of_pending_messages += 1;
 
@@ -433 +434 @@
       _CORE_message_queue_Prepend( the_message_queue, the_message );
       break;
-  }
-
+    default:
+      /* XXX interrupt critical section needs to be addressed */
+      {
+        CORE_message_queue_Buffer_control *this_message;
+        Chain_Node                        *the_node;
+
+        the_message->priority = submit_type;
+        for ( the_node = the_message_queue->Pending_messages.first ;
+           !_Chain_Is_tail( &the_message_queue->Pending_messages, the_node ) ;
+           the_node = the_node->next ) {
+
+          this_message = (CORE_message_queue_Buffer_control *) the_node;
+
+          if ( this_message->priority >= the_message->priority )
+            continue;
+
+          _Chain_Insert( the_node, &the_message->Node );
+          break;
+        }
+      }
+      break;
+  }
+
+  /*
+   *  According to POSIX, does this happen before or after the message
+   *  is actually enqueued.  It is logical to think afterwards, because
+   *  the message is actually in the queue at this point.
+   */
+
+  if ( the_message_queue->number_of_pending_messages == 1 && 
+       the_message_queue->notify_handler )
+    (*the_message_queue->notify_handler)( the_message_queue->notify_argument );
+  
   return CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
 }