Skip to content

Commit

Permalink
fs/mqueue/mq_check.c: group level error check for mq operations
Browse files Browse the repository at this point in the history
	- This commit creates an api mq_check() for mqueue module.
	  This api will check the mq descriptor value in the
	  mq des list of the calling task's group. This will help
	  to remove unwanted error in mq_send and mq_receive apis.
  • Loading branch information
ritesh55555 committed Dec 10, 2024
1 parent 086c48b commit a9138e8
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 11 deletions.
2 changes: 1 addition & 1 deletion os/fs/mqueue/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

ifneq ($(CONFIG_DISABLE_MQUEUE),y)

CSRCS += mq_open.c mq_close.c mq_unlink.c
CSRCS += mq_open.c mq_close.c mq_unlink.c mq_check.c

# Include POSIX message queue build support

Expand Down
106 changes: 106 additions & 0 deletions os/fs/mqueue/mq_check.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
/****************************************************************************
*
* Copyright 2024 Samsung Electronics All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*
****************************************************************************/
/************************************************************************
* fs/mqueue/mq_check.c
*
* Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <[email protected]>
*
* 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 <tinyara/config.h>

#include <stdio.h>
#include <mqueue.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>

#include <tinyara/mqueue.h>

/************************************************************************
* Public Functions
************************************************************************/

/************************************************************************
* Name: mq_check
*
* Description:
* This function checks if a message queue descriptor is present in the
* calling task's group list of mq des.
*
* Parameters:
* mqdes - Message queue descriptor
*
* Return Value:
* OK - if mqdes is present in the calling task group list of mqdes
* ERROR - if mqdes is not present in the calling task group of mqdes
*
************************************************************************/

int mq_check(mqd_t mqdes)
{
int ret = ERROR;
mqd_t mqdes_ptr;

FAR struct task_group_s *group = sched_self()->group;

sched_lock();
mqdes_ptr = (mqd_t)sq_peek(&group->tg_msgdesq);
while (mqdes_ptr) {
if (mqdes_ptr == mqdes) {
ret = OK;
break;
}
mqdes_ptr = (mqd_t)sq_next(mqdes_ptr);
}
sched_unlock();

return ret;
}
11 changes: 1 addition & 10 deletions os/fs/mqueue/mq_close.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,8 @@ int mq_close_group(mqd_t mqdes, FAR struct task_group_s *group)
if (mqdes) {
sched_lock();

/* Check that mqdes is in one's group */
mqdes_ptr = (mqd_t)sq_peek(&group->tg_msgdesq);
while (mqdes_ptr) {
if (mqdes_ptr == mqdes) {
break;
}
mqdes_ptr = (mqd_t)sq_next(mqdes_ptr);
}

/* If there is no mqdes in one's group, skip to desclose and inode release. */
if (mqdes_ptr != NULL) {
if (mq_check(mqdes) == OK) {

/* Find the message queue associated with the message descriptor */

Expand Down
7 changes: 7 additions & 0 deletions os/include/mqueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,13 @@ int mq_setattr(mqd_t mqdes, FAR const struct mq_attr *mq_stat, FAR struct mq_att
* @since TizenRT v1.0
*/
int mq_getattr(mqd_t mqdes, FAR struct mq_attr *mq_stat);
/**
* @brief get message queue attributes
* @details @b #include <mqueue.h> \n
* POSIX API (refer to : http://pubs.opengroup.org/onlinepubs/9699919799/)
* @since TizenRT v1.0
*/
int mq_check(mqd_t mqdes);

#undef EXTERN
#ifdef __cplusplus
Expand Down
5 changes: 5 additions & 0 deletions os/kernel/mqueue/mq_receive.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ ssize_t mq_receive(mqd_t mqdes, FAR char *msg, size_t msglen, FAR int *prio)
return ERROR;
}

if (mq_check(mqdes) != OK) {
leave_cancellation_point();
return ERROR;
}

/* Get the next message from the message queue. We will disable
* pre-emption until we have completed the message received. This
* is not too bad because if the receipt takes a long time, it will
Expand Down
5 changes: 5 additions & 0 deletions os/kernel/mqueue/mq_send.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ int mq_send(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio)
return ERROR;
}

if (mq_check(mqdes) != OK) {
leave_cancellation_point();
return ERROR;
}

/* Get a pointer to the message queue */

msgq = mqdes->msgq;
Expand Down

0 comments on commit a9138e8

Please sign in to comment.