posix: Simplify message queues

The mq_open() function returns a descriptor to a POSIX message queue
object identified by a name.  This is similar to sem_open().  In
contrast to the POSIX semaphore the POSIX message queues use a separate
object for the descriptor.  This extra object is superfluous, since the
object identifier can be used directly for this purpose, just like for
the semaphores.

Update #2702.
Update #2555.

1 files changed, 71 insertions, 91 deletions

diff --git a/cpukit/posix/src/mqueuesendsupp.c b/cpukit/posix/src/mqueuesendsupp.c
index ade92b0621..0d9974afe4 100644
--- a/cpukit/posix/src/mqueuesendsupp.c
+++ b/cpukit/posix/src/mqueuesendsupp.c
@@ -30,23 +30,9 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
-
-#include <pthread.h>
-#include <limits.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <mqueue.h>
-
-#include <rtems/system.h>
-#include <rtems/score/watchdog.h>
-#include <rtems/seterr.h>
 #include <rtems/posix/mqueueimpl.h>
 
-
-/*
- *  _POSIX_Message_queue_Send_support
- */
+#include <fcntl.h>
 
 int _POSIX_Message_queue_Send_support(
   mqd_t               mqdes,
@@ -57,92 +43,86 @@ int _POSIX_Message_queue_Send_support(
   Watchdog_Interval   timeout
 )
 {
-  POSIX_Message_queue_Control    *the_mq;
-  POSIX_Message_queue_Control_fd *the_mq_fd;
-  Objects_Locations               location;
-  CORE_message_queue_Status       msg_status;
-  bool                            do_wait;
-  Thread_Control                 *executing;
-  ISR_lock_Context                lock_context;
+  POSIX_Message_queue_Control *the_mq;
+  ISR_lock_Context             lock_context;
+  CORE_message_queue_Status    msg_status;
+  bool                         do_wait;
+  Thread_Control              *executing;
 
   /*
    * Validate the priority.
    * XXX - Do not validate msg_prio is not less than 0.
    */
 
-  if ( msg_prio > MQ_PRIO_MAX )
+  if ( msg_prio > MQ_PRIO_MAX ) {
     rtems_set_errno_and_return_minus_one( EINVAL );
+  }
 
-  the_mq_fd = _POSIX_Message_queue_Get_fd_interrupt_disable(
-    mqdes,
-    &location,
+  the_mq = _POSIX_Message_queue_Get( mqdes, &lock_context );
+
+  if ( the_mq == NULL ) {
+    rtems_set_errno_and_return_minus_one( EBADF );
+  }
+
+  if ( ( the_mq->oflag & O_ACCMODE ) == O_RDONLY ) {
+    _ISR_lock_ISR_enable( &lock_context );
+    rtems_set_errno_and_return_minus_one( EBADF );
+  }
+
+  /*
+   *  A timed receive with a bad time will do a poll regardless.
+   */
+  if ( wait ) {
+    do_wait = ( the_mq->oflag & O_NONBLOCK ) == 0;
+  } else {
+    do_wait = wait;
+  }
+
+  _CORE_message_queue_Acquire_critical(
+    &the_mq->Message_queue,
     &lock_context
   );
-  switch ( location ) {
-
-    case OBJECTS_LOCAL:
-      if ( (the_mq_fd->oflag & O_ACCMODE) == O_RDONLY ) {
-        _ISR_lock_ISR_enable( &lock_context );
-        rtems_set_errno_and_return_minus_one( EBADF );
-      }
-
-      the_mq = the_mq_fd->Queue;
-
-      /*
-       *  A timed receive with a bad time will do a poll regardless.
-       */
-      if ( wait )
-        do_wait = (the_mq_fd->oflag & O_NONBLOCK) ? false : true;
-      else
-        do_wait = wait;
-
-      _CORE_message_queue_Acquire_critical(
-        &the_mq->Message_queue,
-        &lock_context
-      );
-
-      /*
-       *  Now perform the actual message receive
-       */
-      executing = _Thread_Executing;
-      msg_status = _CORE_message_queue_Submit(
-        &the_mq->Message_queue,
-        executing,
-        msg_ptr,
-        msg_len,
-        NULL,
-        0,
-        _POSIX_Message_queue_Priority_to_core( msg_prio ),
-        do_wait,
-        timeout,   /* no timeout */
-        &lock_context
-      );
-
-      /*
-       *  If we had to block, then this is where the task returns
-       *  after it wakes up.  The returned status is correct for
-       *  non-blocking operations but if we blocked, then we need
-       *  to look at the status in our TCB.
-       */
-
-      if ( msg_status == CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT )
-        msg_status = executing->Wait.return_code;
-
-      if ( !msg_status )
-        return msg_status;
-
-      rtems_set_errno_and_return_minus_one(
-        _POSIX_Message_queue_Translate_core_message_queue_return_code(
-          msg_status
-        )
-      );
-
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:
-#endif
-    case OBJECTS_ERROR:
-      break;
+
+  if ( the_mq->open_count == 0 ) {
+    _CORE_message_queue_Release( &the_mq->Message_queue, &lock_context );
+    rtems_set_errno_and_return_minus_one( EBADF );
+  }
+
+  /*
+   *  Now perform the actual message receive
+   */
+  executing = _Thread_Executing;
+  msg_status = _CORE_message_queue_Submit(
+    &the_mq->Message_queue,
+    executing,
+    msg_ptr,
+    msg_len,
+    NULL,
+    0,
+    _POSIX_Message_queue_Priority_to_core( msg_prio ),
+    do_wait,
+    timeout,
+    &lock_context
+  );
+
+  /*
+   *  If we had to block, then this is where the task returns
+   *  after it wakes up.  The returned status is correct for
+   *  non-blocking operations but if we blocked, then we need
+   *  to look at the status in our TCB.
+   */
+
+  if ( msg_status == CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT ) {
+    msg_status = executing->Wait.return_code;
+  }
+
+  if ( msg_status != CORE_MESSAGE_QUEUE_STATUS_SUCCESSFUL ) {
+    rtems_set_errno_and_return_minus_one(
+      _POSIX_Message_queue_Translate_core_message_queue_return_code(
+        msg_status
+      )
+    );
   }
 
-  rtems_set_errno_and_return_minus_one( EBADF );
+  return 0;
 }