Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-10-07 00:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[components][posix] 完善 posix 接口消息队列 (#7395)

Browse Source
This commit is contained in:
zhkag
2023-05-05 18:14:07 +08:00
committed by GitHub
parent bc9fe6d3c8
commit a6a9b0dfcb
3 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/libc/posix/ipc/mqueue.c
+79 -40
View File
File diff suppressed because it is too large Load Diff
components/libc/posix/ipc/mqueue.h
+5 -1
View File
@@ -22,10 +22,14 @@ struct mqdes
/* RT-Thread message queue */
rt_mq_t mq;
int mq_id;
/* next posix mqueue */
struct mqdes* next;
};
typedef struct mqdes* mqd_t;
typedef struct mqdes* mqdes_t;
typedef int mqd_t;
struct mq_attr
{
components/lwp/lwp_syscall.c
+26 -5
View File
@@ -4378,10 +4378,22 @@ mqd_t sys_mq_open(const char *name, int flags, mode_t mode, struct mq_attr *attr
if (!kname)
return (mqd_t)-ENOMEM;
lwp_get_from_user(&attr_k, (void *)attr, sizeof(struct mq_attr));
if (attr == NULL)
{
attr_k.mq_maxmsg = 10;
attr_k.mq_msgsize = 8192;
attr_k.mq_flags = 0;
attr = &attr_k;
}
else
{
if (!lwp_get_from_user(&attr_k, (void *)attr, sizeof(struct mq_attr)))
return -EINVAL;
}
lwp_get_from_user(kname, (void *)name, len + 1);
mqdes = mq_open(kname, flags, mode, &attr_k);
if (mqdes == RT_NULL)
if (mqdes == -1)
{
ret = GET_ERRNO();
}
@@ -4390,7 +4402,7 @@ mqd_t sys_mq_open(const char *name, int flags, mode_t mode, struct mq_attr *attr
#else
mqdes = mq_open(name, flags, mode, attr);
#endif
if (mqdes == RT_NULL)
if (mqdes == -1)
return (mqd_t)ret;
else
return mqdes;
@@ -4476,9 +4488,18 @@ sysret_t sys_mq_timedreceive(mqd_t mqd, char *restrict msg, size_t len, unsigned
if (!kmsg)
return -ENOMEM;
lwp_get_from_user(&at_k, (void *)at, sizeof(struct timespec));
lwp_get_from_user(kmsg, (void *)msg, len + 1);
ret = mq_timedreceive(mqd, kmsg, len, prio, &at_k);
if (at == RT_NULL)
{
ret = mq_timedreceive(mqd, kmsg, len, prio, RT_NULL);
}
else
{
if (!lwp_get_from_user(&at_k, (void *)at, sizeof(struct timespec)))
return -EINVAL;
ret = mq_timedreceive(mqd, kmsg, len, prio, &at_k);
}
if (ret > 0)
lwp_put_to_user(msg, kmsg, len + 1);