diff --git a/ChangeLog b/ChangeLog
index 577e6473fdf2a7e0050344f36d633ebf91b11679..5b328f35bacd25abde95eb37cb54e43524eb6900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4116,4 +4116,9 @@
Move waitpid data data structures to task group. Callers of
of waitpid() are now only awakened whent he final thread of the
task group exits.
+ * sched/mq_descreate.c, mq_open.c, mq_remove.c, group_leave.c, and
+ include/nuttx/sched.h: Move list of opened message queues to
+ the task group structures. Now all message queues opened by
+ members of the group are closed when the last member of the group
+ exits.
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 41715cb0aa6d0a1e02e66976ab0661c5382b921c..082ce65dd0d3938a18d4c9fb55ebef32e3da4574 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -77,7 +77,7 @@
*/
#else
-# if !defined(CONFIG_DISABLE_ENVIRON) /* Environment variales */
+# if !defined(CONFIG_DISABLE_ENVIRON) /* Environment variables */
# define HAVE_TASK_GROUP 1
# elif defined(CONFIG_SCHED_ATEXIT) /* Group atexit() function */
# define HAVE_TASK_GROUP 1
@@ -91,6 +91,8 @@
# define HAVE_TASK_GROUP 1
# elif CONFIG_NSOCKET_DESCRIPTORS > 0 /* Sockets */
# define HAVE_TASK_GROUP 1
+# elif !defined(CONFIG_DISABLE_MQUEUE) /* Message queues */
+# define HAVE_TASK_GROUP 1
# endif
#endif
@@ -375,6 +377,11 @@ struct task_group_s
#if CONFIG_NSOCKET_DESCRIPTORS > 0
struct socketlist tg_socketlist; /* Maps socket descriptor to socket */
+#endif
+ /* POSIX Named Message Queue Fields *******************************************/
+
+#ifndef CONFIG_DISABLE_MQUEUE
+ sq_queue_t tg_msgdesq; /* List of opened message queues */
#endif
};
#endif
@@ -488,13 +495,12 @@ struct _TCB
/* POSIX Named Message Queue Fields *******************************************/
#ifndef CONFIG_DISABLE_MQUEUE
- sq_queue_t msgdesq; /* List of opened message queues */
FAR msgq_t *msgwaitq; /* Waiting for this message queue */
#endif
/* Library related fields *****************************************************/
- int pterrno; /* Current per-thread errno */
+ int pterrno; /* Current per-thread errno */
/* State save areas ***********************************************************/
/* The form and content of these fields are processor-specific. */
@@ -504,7 +510,6 @@ struct _TCB
#if CONFIG_TASK_NAME_SIZE > 0
char name[CONFIG_TASK_NAME_SIZE]; /* Task name */
#endif
-
};
/* Certain other header files may also define this time to avoid circular header
diff --git a/sched/Makefile b/sched/Makefile
index 6a9c62d2972526acd74fa45bb9a1aa575cb606e5..4889436883ec5d4ba8682196f63bbad3f8903ab3 100644
--- a/sched/Makefile
+++ b/sched/Makefile
@@ -122,11 +122,13 @@ SIGNAL_SRCS += sig_kill.c sig_queue.c sig_waitinfo.c sig_timedwait.c
SIGNAL_SRCS += sig_findaction.c sig_allocatependingsigaction.c
SIGNAL_SRCS += sig_releasependingsigaction.c sig_unmaskpendingsignal.c
SIGNAL_SRCS += sig_removependingsignal.c sig_releasependingsignal.c sig_lowest.c
-SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_received.c sig_deliver.c pause.c
+SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_received.c sig_deliver.c
+SIGNAL_SRCS += pause.c
MQUEUE_SRCS = mq_open.c mq_close.c mq_unlink.c mq_send.c mq_timedsend.c
MQUEUE_SRCS += mq_sndinternal.c mq_receive.c mq_timedreceive.c mq_rcvinternal.c
-MQUEUE_SRCS += mq_initialize.c mq_descreate.c mq_findnamed.c mq_msgfree.c mq_msgqfree.c
+MQUEUE_SRCS += mq_initialize.c mq_descreate.c mq_findnamed.c mq_msgfree.c
+MQUEUE_SRCS += mq_msgqfree.c mq_release.c
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
MQUEUE_SRCS += mq_waitirq.c
diff --git a/sched/group_leave.c b/sched/group_leave.c
index e56952a7b41e5120eef349612c6da667609df712..30faafa4f210aee2ba8fc656ce292e3f762c781e 100644
--- a/sched/group_leave.c
+++ b/sched/group_leave.c
@@ -50,6 +50,7 @@
#include "env_internal.h"
#include "pthread_internal.h"
+#include "mq_internal.h"
#include "group_internal.h"
#ifdef HAVE_TASK_GROUP
@@ -190,6 +191,12 @@ static inline void group_release(FAR struct task_group_s *group)
env_release(group);
#endif
+ /* Close message queues opened by members of the group */
+
+#ifndef CONFIG_DISABLE_MQUEUE
+ mq_release(group);
+#endif
+
#ifdef HAVE_GROUP_MEMBERS
/* Remove the group from the list of groups */
diff --git a/sched/mq_close.c b/sched/mq_close.c
index 57780a8e6a02c6b099ced538dde3578f21bed9cb..464056ce0715b3fd566c350efce693c1bbc1463a 100644
--- a/sched/mq_close.c
+++ b/sched/mq_close.c
@@ -1,7 +1,7 @@
/****************************************************************************
* sched/mq_close.c
*
- * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,7 @@
#include <mqueue.h>
#include <sched.h>
+#include <assert.h>
#include "os_internal.h"
#include "mq_internal.h"
@@ -112,10 +113,13 @@
int mq_close(mqd_t mqdes)
{
- FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
+ FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
+ FAR struct task_group_s *group = rtcb->group;
FAR msgq_t *msgq;
- irqstate_t saved_state;
- int ret = ERROR;
+ irqstate_t saved_state;
+ int ret = ERROR;
+
+ DEBUGASSERT(group);
/* Verify the inputs */
@@ -127,7 +131,7 @@ int mq_close(mqd_t mqdes)
* list of message descriptors.
*/
- sq_rem((FAR sq_entry_t*)mqdes, &rtcb->msgdesq);
+ sq_rem((FAR sq_entry_t*)mqdes, &group->tg_msgdesq);
/* Find the message queue associated with the message descriptor */
diff --git a/sched/mq_descreate.c b/sched/mq_descreate.c
index 14937888c58cf48881271e298bcd25b24af51a67..3fe696fc5185f5725bdcaafe61855911bd67939e 100644
--- a/sched/mq_descreate.c
+++ b/sched/mq_descreate.c
@@ -1,7 +1,7 @@
/****************************************************************************
* sched/mq_descreate.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -137,8 +137,11 @@ static mqd_t mq_desalloc(void)
mqd_t mq_descreate(FAR _TCB* mtcb, FAR msgq_t* msgq, int oflags)
{
+ FAR struct task_group_s *group = mtcb->group;
mqd_t mqdes;
+ DEBUGASSERT(group);
+
/* Create a message queue descriptor for the TCB */
mqdes = mq_desalloc();
@@ -152,7 +155,7 @@ mqd_t mq_descreate(FAR _TCB* mtcb, FAR msgq_t* msgq, int oflags)
/* And add it to the specified tasks's TCB */
- sq_addlast((FAR sq_entry_t*)mqdes, &mtcb->msgdesq);
+ sq_addlast((FAR sq_entry_t*)mqdes, &group->tg_msgdesq);
}
return mqdes;
diff --git a/sched/mq_internal.h b/sched/mq_internal.h
index 6135bfaef3fd8af712c9bee49d70fe57db7b5d23..90072cb60d74f4ed2c1dea09d9d6a46a12666f3c 100644
--- a/sched/mq_internal.h
+++ b/sched/mq_internal.h
@@ -1,7 +1,7 @@
/****************************************************************************
* sched/mq_internal.h
*
- * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -109,69 +109,73 @@ typedef struct mqmsg mqmsg_t;
* Global Variables
****************************************************************************/
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
/* This is a list of all opened message queues */
-extern sq_queue_t g_msgqueues;
+EXTERN sq_queue_t g_msgqueues;
/* The g_msgfree is a list of messages that are available for general use.
* The number of messages in this list is a system configuration item.
*/
-extern sq_queue_t g_msgfree;
+EXTERN sq_queue_t g_msgfree;
/* The g_msgfreeInt is a list of messages that are reserved for use by
* interrupt handlers.
*/
-extern sq_queue_t g_msgfreeirq;
+EXTERN sq_queue_t g_msgfreeirq;
/* The g_desfree data structure is a list of message descriptors available
* to the operating system for general use. The number of messages in the
* pool is a constant.
*/
-extern sq_queue_t g_desfree;
+EXTERN sq_queue_t g_desfree;
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
/* Functions defined in mq_initialize.c ************************************/
-EXTERN void weak_function mq_initialize(void);
-EXTERN void mq_desblockalloc(void);
+void weak_function mq_initialize(void);
+void mq_desblockalloc(void);
-EXTERN mqd_t mq_descreate(FAR _TCB* mtcb, FAR msgq_t* msgq, int oflags);
-EXTERN FAR msgq_t *mq_findnamed(const char *mq_name);
-EXTERN void mq_msgfree(FAR mqmsg_t *mqmsg);
-EXTERN void mq_msgqfree(FAR msgq_t *msgq);
+mqd_t mq_descreate(FAR _TCB* mtcb, FAR msgq_t* msgq, int oflags);
+FAR msgq_t *mq_findnamed(const char *mq_name);
+void mq_msgfree(FAR mqmsg_t *mqmsg);
+void mq_msgqfree(FAR msgq_t *msgq);
/* mq_waitirq.c ************************************************************/
-EXTERN void mq_waitirq(FAR _TCB *wtcb, int errcode);
+void mq_waitirq(FAR _TCB *wtcb, int errcode);
/* mq_rcvinternal.c ********************************************************/
-EXTERN int mq_verifyreceive(mqd_t mqdes, void *msg, size_t msglen);
-EXTERN FAR mqmsg_t *mq_waitreceive(mqd_t mqdes);
-EXTERN ssize_t mq_doreceive(mqd_t mqdes, mqmsg_t *mqmsg, void *ubuffer,
- int *prio);
+int mq_verifyreceive(mqd_t mqdes, void *msg, size_t msglen);
+FAR mqmsg_t *mq_waitreceive(mqd_t mqdes);
+ssize_t mq_doreceive(mqd_t mqdes, mqmsg_t *mqmsg, void *ubuffer, int *prio);
/* mq_sndinternal.c ********************************************************/
-EXTERN int mq_verifysend(mqd_t mqdes, const void *msg, size_t msglen,
- int prio);
-EXTERN FAR mqmsg_t *mq_msgalloc(void);
-EXTERN int mq_waitsend(mqd_t mqdes);
-EXTERN int mq_dosend(mqd_t mqdes, FAR mqmsg_t *mqmsg, const void *msg,
- size_t msglen, int prio);
+int mq_verifysend(mqd_t mqdes, const void *msg, size_t msglen, int prio);
+FAR mqmsg_t *mq_msgalloc(void);
+int mq_waitsend(mqd_t mqdes);
+int mq_dosend(mqd_t mqdes, FAR mqmsg_t *mqmsg, const void *msg,
+ size_t msglen, int prio);
+
+/* mq_release.c ************************************************************/
+
+struct task_group_s; /* Forward reference */
+void mq_release(FAR struct task_group_s *group);
#undef EXTERN
#ifdef __cplusplus
diff --git a/sched/mq_release.c b/sched/mq_release.c
new file mode 100644
index 0000000000000000000000000000000000000000..c1d59b0ce56254ee6d8bbdcc7b0c0686b06ca516
--- /dev/null
+++ b/sched/mq_release.c
@@ -0,0 +1,92 @@
+/************************************************************************
+ * sched/mq_release.c
+ *
+ * Copyright (C) 2013 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 <string.h>
+
+#include "mq_internal.h"
+
+/************************************************************************
+ * Definitions
+ ************************************************************************/
+
+/************************************************************************
+ * Private Type Declarations
+ ************************************************************************/
+
+/************************************************************************
+ * Global Variables
+ ************************************************************************/
+
+/************************************************************************
+ * Private Variables
+ ************************************************************************/
+
+/************************************************************************
+ * Private Functions
+ ************************************************************************/
+
+/************************************************************************
+ * Public Functions
+ ************************************************************************/
+
+/************************************************************************
+ * Name: mq_release
+ *
+ * Description:
+ * This function is called when the final member of a task group exits.
+ * This function closes all of the message queues opened by members of
+ * the task group.
+ *
+ * Inputs:
+ * group - The task group that is terminating.
+ *
+ * Return Value:
+ * None
+ *
+ ************************************************************************/
+
+void mq_release(FAR struct task_group_s *group)
+{
+ while (group->tg_msgdesq.head)
+ {
+ mq_close((mqd_t)group->tg_msgdesq.head);
+ }
+}