POSIX message queues: Move mq_setattr() and mq_getattr() from nuttx/libc/mqueue to nuttx/sched/mqueue. Also add sysyscall support for mq_setattr() and mq_getattr(). This is necessary in protected and kernel builds because in those cases the message queue structure is protect and cannot be accessed directly from user mode code. Noted by Jouko Holopainen.

2026-06-06 16:50:55 +08:00 · 2015-06-03 09:24:17 -06:00
parent 3ee2902c3e
commit d8db596b3b
11 changed files with 23 additions and 105 deletions
@@ -38,7 +38,8 @@ ifneq ($(CONFIG_DISABLE_MQUEUE),y)
 CSRCS += mq_send.c mq_timedsend.c mq_sndinternal.c mq_receive.c
 CSRCS += mq_timedreceive.c mq_rcvinternal.c mq_initialize.c
 CSRCS += mq_descreate.c mq_desclose.c mq_msgfree.c mq_msgqalloc.c
-CSRCS += mq_msgqfree.c mq_release.c mq_recover.c
+CSRCS += mq_msgqfree.c mq_release.c mq_recover.c mq_setattr.c
+CSRCS += mq_getattr.c

 ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 CSRCS += mq_waitirq.c mq_notify.c
@@ -0,0 +1,84 @@
+/************************************************************************
+ * sched/mqueue/mq_getattr.c
+ *
+ *   Copyright (C) 2007, 2009, 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************/
+
+/************************************************************************
+ * Included Files
+ ************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <mqueue.h>
+#include <nuttx/mqueue.h>
+
+/************************************************************************
+ * Public Functions
+ ************************************************************************/
+
+/************************************************************************
+ * Function:  mq_getattr
+ *
+ * Description:
+ *   This functions gets status information and attributes
+ *   associated with the specified message queue.
+ *
+ * Parameters:
+ *   mqdes - Message queue descriptor
+ *   mq_stat - Buffer in which to return attributes
+ *
+ * Return Value:
+ *   0 (OK) if attributes provided, -1 (ERROR) otherwise.
+ *
+ * Assumptions:
+ *
+ ************************************************************************/
+
+int mq_getattr(mqd_t mqdes, struct mq_attr *mq_stat)
+{
+  int ret = ERROR;
+
+  if (mqdes && mq_stat)
+    {
+      /* Return the attributes */
+
+      mq_stat->mq_maxmsg  = mqdes->msgq->maxmsgs;
+      mq_stat->mq_msgsize = mqdes->msgq->maxmsgsize;
+      mq_stat->mq_flags   = mqdes->oflags;
+      mq_stat->mq_curmsgs = mqdes->msgq->nmsgs;
+
+      ret = OK;
+    }
+
+  return ret;
+}
@@ -0,0 +1,98 @@
+/************************************************************************
+ * sched/mqueue/mq_setattr.c
+ *
+ *   Copyright (C) 2007, 2009, 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************/
+
+/************************************************************************
+ * Included Files
+ ************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <fcntl.h>          /* O_NONBLOCK */
+#include <mqueue.h>
+
+#include <nuttx/mqueue.h>
+
+/************************************************************************
+ * Public Functions
+ ************************************************************************/
+
+/************************************************************************
+ * Function:  mq_setattr
+ *
+ * Description:
+ *   This function sets the attributes associated with the
+ *   specified message queue "mqdes."  Only the "O_NONBLOCK"
+ *   bit of the "mq_flags" can be changed.
+ *
+ *   If "oldstat" is non-null, mq_setattr() will store the
+ *   previous message queue attributes at that location (just
+ *   as would have been returned by mq_getattr()).
+ *
+ * Parameters:
+ *   mqdes - Message queue descriptor
+ *   mq_stat - New attributes
+ *   oldstate - Old attributes
+ *
+ * Return Value:
+ *   0 (OK) if attributes are set successfully, otherwise
+ *   -1 (ERROR).
+ *
+ * Assumptions:
+ *
+ ************************************************************************/
+
+int mq_setattr(mqd_t mqdes, const struct mq_attr *mq_stat,
+               struct mq_attr *oldstat)
+{
+  int ret = ERROR;
+
+  if (mqdes && mq_stat)
+    {
+      /* Return the attributes if so requested */
+
+      if (oldstat)
+        {
+          (void)mq_getattr(mqdes, oldstat);
+        }
+
+      /* Set the new value of the O_NONBLOCK flag. */
+
+      mqdes->oflags = ((mq_stat->mq_flags & O_NONBLOCK) |
+                       (mqdes->oflags & (~O_NONBLOCK)));
+      ret = OK;
+    }
+
+  return ret;
+}