POSIX message queues now include complete functionality including

blocking sends when the queue is full.  The SuperCore was enhanced
to support blocking on send.  The existing POSIX API was debugged
and numerous test cases were added to psxmsgq01 by Jennifer Averett.
SuperCore enhancements and resulting modifications to other APIs
were done by Joel.

There is one significant point of interpretation for the POSIX API.
What happens to threads already blocked on a message queue when the
mode of that same message queue is changed from blocking to non-blocking?
We decided to unblock all waiting tasks with an EAGAIN error just
as if a non-blocking version of the same operation had returned
unsatisfied.  This case is not discussed in the POSIX standard and
other implementations may have chosen differently.

3 files changed, 31 insertions, 30 deletions

diff --git a/c/src/exec/rtems/src/msgqcreate.c b/c/src/exec/rtems/src/msgqcreate.c
index 395cbf3a02..24bc35993d 100644
--- a/c/src/exec/rtems/src/msgqcreate.c
+++ b/c/src/exec/rtems/src/msgqcreate.c
@@ -59,7 +59,7 @@ rtems_status_code rtems_message_queue_create(
 )
 {
   register Message_queue_Control *the_message_queue;
-  CORE_message_queue_Attributes   the_message_queue_attributes;
+  CORE_message_queue_Attributes   the_msgq_attributes;
   void                           *handler;
 #if defined(RTEMS_MULTIPROCESSING)
   boolean                         is_global;
@@ -74,10 +74,10 @@ rtems_status_code rtems_message_queue_create(
     return RTEMS_MP_NOT_CONFIGURED;
 #endif
 
-  if (count == 0)
+  if ( count == 0 )
       return RTEMS_INVALID_NUMBER;
 
-  if (max_message_size == 0)
+  if ( max_message_size == 0 )
       return RTEMS_INVALID_SIZE;
 
 #if defined(RTEMS_MULTIPROCESSING)
@@ -115,11 +115,9 @@ rtems_status_code rtems_message_queue_create(
   the_message_queue->attribute_set = attribute_set;
 
   if (_Attributes_Is_priority( attribute_set ) )
-    the_message_queue_attributes.discipline = 
-                                      CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY;
+    the_msgq_attributes.discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_PRIORITY;
   else
-    the_message_queue_attributes.discipline =
-                                      CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
+    the_msgq_attributes.discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
 
   handler = NULL;
 #if defined(RTEMS_MULTIPROCESSING)
@@ -129,7 +127,7 @@ rtems_status_code rtems_message_queue_create(
   if ( ! _CORE_message_queue_Initialize(
            &the_message_queue->message_queue,
            OBJECTS_RTEMS_MESSAGE_QUEUES,
-           &the_message_queue_attributes,
+           &the_msgq_attributes,
            count,
            max_message_size,
            handler ) ) {
diff --git a/c/src/exec/rtems/src/msgqreceive.c b/c/src/exec/rtems/src/msgqreceive.c
index 1338216c6b..77fcadc313 100644
--- a/c/src/exec/rtems/src/msgqreceive.c
+++ b/c/src/exec/rtems/src/msgqreceive.c
@@ -92,12 +92,12 @@ rtems_status_code rtems_message_queue_receive(
         buffer,
         size,
         wait,
-        &core_priority,
         timeout
       );
       _Thread_Enable_dispatch();
-      return( _Message_queue_Translate_core_message_queue_return_code(
-                  _Thread_Executing->Wait.return_code ) );
+      return _Message_queue_Translate_core_message_queue_return_code(
+        _Thread_Executing->Wait.return_code
+      );
 
   }
 
diff --git a/c/src/exec/rtems/src/msgqsubmit.c b/c/src/exec/rtems/src/msgqsubmit.c
index 5a03f6409a..16f1c50266 100644
--- a/c/src/exec/rtems/src/msgqsubmit.c
+++ b/c/src/exec/rtems/src/msgqsubmit.c
@@ -61,7 +61,6 @@ rtems_status_code _Message_queue_Submit(
 {
   register Message_queue_Control  *the_message_queue;
   Objects_Locations                location;
-  CORE_message_queue_Status        core_status;
 
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location )
@@ -98,39 +97,43 @@ rtems_status_code _Message_queue_Submit(
     case OBJECTS_LOCAL:
       switch ( submit_type ) {
         case MESSAGE_QUEUE_SEND_REQUEST:
-          core_status = _CORE_message_queue_Send(
-                          &the_message_queue->message_queue,
-                          buffer,
-                          size,
-                          id,
+          _CORE_message_queue_Send(
+            &the_message_queue->message_queue,
+            buffer,
+            size,
+            id,
 #if defined(RTEMS_MULTIPROCESSING)
-                          _Message_queue_Core_message_queue_mp_support
+            _Message_queue_Core_message_queue_mp_support,
 #else
-                          NULL
+            NULL,
 #endif
-                        );
+            FALSE,   /* sender does not block */
+            0        /* no timeout */
+          );
           break;
         case MESSAGE_QUEUE_URGENT_REQUEST:
-          core_status = _CORE_message_queue_Urgent(
-                          &the_message_queue->message_queue,
-                          buffer,
-                          size,
-                          id,
+          _CORE_message_queue_Urgent(
+            &the_message_queue->message_queue,
+            buffer,
+            size,
+            id,
 #if defined(RTEMS_MULTIPROCESSING)
-                          _Message_queue_Core_message_queue_mp_support
+            _Message_queue_Core_message_queue_mp_support,
 #else
-                          NULL
+            NULL,
 #endif
-                        );
+            FALSE,   /* sender does not block */
+            0        /* no timeout */
+          );
           break;
         default:
-          core_status = CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL;
           return RTEMS_INTERNAL_ERROR;   /* should never get here */
       }
 
       _Thread_Enable_dispatch();
       return _Message_queue_Translate_core_message_queue_return_code(
-                core_status );
+        _Thread_Executing->Wait.return_code
+      );
           
   }
   return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */