Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
339e937a
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
10 个月 前同步成功
通知
450
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
339e937a
编写于
8月 13, 2021
作者:
O
openharmony_ci
提交者:
Gitee
8月 13, 2021
浏览文件
操作
浏览文件
下载
差异文件
!495 修复mqueue问题
Merge pull request !495 from lnlan/fix_mqueue_0803
上级
5910c9ab
26ee8b83
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
61 addition
and
64 deletion
+61
-64
compat/posix/include/mqueue.h
compat/posix/include/mqueue.h
+1
-2
compat/posix/src/mqueue.c
compat/posix/src/mqueue.c
+59
-61
fs/vfs/operation/vfs_procfd.c
fs/vfs/operation/vfs_procfd.c
+1
-1
未找到文件。
compat/posix/include/mqueue.h
浏览文件 @
339e937a
...
...
@@ -95,7 +95,6 @@ struct mqarray {
mode_s
mode_data
;
/* mode data of mqueue */
uid_t
euid
;
/* euid of mqueue */
gid_t
egid
;
/* egid of mqueue */
fd_set
mq_fdset
;
/* mqueue sysFd bit map */
struct
mqnotify
mq_notify
;
LosQueueCB
*
mqcb
;
struct
mqpersonal
*
mq_personal
;
...
...
@@ -423,7 +422,7 @@ extern int mq_timedsend(mqd_t personal, const char *msg, size_t msgLen,
extern
ssize_t
mq_timedreceive
(
mqd_t
personal
,
char
*
msg
,
size_t
msgLen
,
unsigned
int
*
msgPrio
,
const
struct
timespec
*
absTimeout
);
extern
void
mqueue_r
efer
(
int
sysFd
);
extern
void
MqueueR
efer
(
int
sysFd
);
extern
int
OsMqNotify
(
mqd_t
personal
,
const
struct
sigevent
*
sigev
);
#ifdef __cplusplus
...
...
compat/posix/src/mqueue.c
浏览文件 @
339e937a
...
...
@@ -49,6 +49,7 @@
#endif
/* GLOBALS */
STATIC
fd_set
g_queueFdSet
;
STATIC
struct
mqarray
g_queueTable
[
LOSCFG_BASE_IPC_QUEUE_LIMIT
];
STATIC
pthread_mutex_t
g_mqueueMutex
=
PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
;
STATIC
struct
mqpersonal
*
g_mqPrivBuf
[
MAX_MQ_FD
];
...
...
@@ -247,6 +248,44 @@ ERROUT:
return
(
struct
mqpersonal
*
)
-
1
;
}
STATIC
INT32
DoMqueueClose
(
struct
mqpersonal
*
privateMqPersonal
)
{
struct
mqarray
*
mqueueCB
=
NULL
;
struct
mqpersonal
*
tmp
=
NULL
;
mqueueCB
=
privateMqPersonal
->
mq_posixdes
;
if
(
mqueueCB
==
NULL
||
mqueueCB
->
mq_personal
==
NULL
)
{
errno
=
EBADF
;
return
LOS_NOK
;
}
/* find the personal and remove */
if
(
mqueueCB
->
mq_personal
==
privateMqPersonal
)
{
mqueueCB
->
mq_personal
=
privateMqPersonal
->
mq_next
;
}
else
{
for
(
tmp
=
mqueueCB
->
mq_personal
;
tmp
->
mq_next
!=
NULL
;
tmp
=
tmp
->
mq_next
)
{
if
(
tmp
->
mq_next
==
privateMqPersonal
)
{
break
;
}
}
if
(
tmp
->
mq_next
==
NULL
)
{
errno
=
EBADF
;
return
LOS_NOK
;
}
tmp
->
mq_next
=
privateMqPersonal
->
mq_next
;
}
/* flag no use */
privateMqPersonal
->
mq_status
=
0
;
/* free the personal */
(
VOID
)
LOS_MemFree
(
OS_SYS_MEM_ADDR
,
privateMqPersonal
);
if
((
mqueueCB
->
unlinkflag
==
TRUE
)
&&
(
mqueueCB
->
mq_personal
==
NULL
))
{
return
DoMqueueDelete
(
mqueueCB
);
}
return
LOS_OK
;
}
/* Translate a sysFd into privateMqPersonal */
STATIC
struct
mqpersonal
*
MqGetPrivDataBuff
(
mqd_t
personal
)
{
...
...
@@ -272,29 +311,24 @@ STATIC struct mqpersonal *MqGetPrivDataBuff(mqd_t personal)
STATIC
INT32
MqAllocSysFd
(
int
maxfdp
,
struct
mqpersonal
*
privateMqPersonal
)
{
INT32
i
;
struct
mqarray
*
mqueueCB
=
privateMqPersonal
->
mq_posixdes
;
fd_set
*
fdset
=
&
mqueueCB
->
mq_fdset
;
fd_set
*
fdset
=
&
g_queueFdSet
;
for
(
i
=
0
;
i
<
maxfdp
;
i
++
)
{
/* sysFd: used bit setting, and get the index of swtmrID buffer */
if
(
!
(
fdset
&&
FD_ISSET
(
i
+
MQUEUE_FD_OFFSET
,
fdset
)))
{
if
(
fdset
&&
!
(
FD_ISSET
(
i
+
MQUEUE_FD_OFFSET
,
fdset
)))
{
FD_SET
(
i
+
MQUEUE_FD_OFFSET
,
fdset
);
if
(
!
g_mqPrivBuf
[
i
])
{
g_mqPrivBuf
[
i
]
=
mqueueCB
->
mq_p
ersonal
;
g_mqPrivBuf
[
i
]
=
privateMqP
ersonal
;
return
i
+
MQUEUE_FD_OFFSET
;
}
}
}
/* there are no more mq sysFd to use, free the personal */
LOS_MemFree
(
OS_SYS_MEM_ADDR
,
privateMqPersonal
);
privateMqPersonal
=
NULL
;
mqueueCB
->
mq_personal
=
NULL
;
return
-
1
;
}
STATIC
VOID
MqFreeSysFd
(
struct
mqarray
*
mqueueCB
,
mqd_t
personal
)
STATIC
VOID
MqFreeSysFd
(
mqd_t
personal
)
{
INT32
sysFd
=
(
INT32
)
personal
;
fd_set
*
fdset
=
&
mqueueCB
->
mq_fds
et
;
fd_set
*
fdset
=
&
g_queueFdS
et
;
if
(
fdset
&&
FD_ISSET
(
sysFd
,
fdset
))
{
FD_CLR
(
sysFd
,
fdset
);
g_mqPrivBuf
[
sysFd
-
MQUEUE_FD_OFFSET
]
=
NULL
;
...
...
@@ -302,7 +336,7 @@ STATIC VOID MqFreeSysFd(struct mqarray *mqueueCB, mqd_t personal)
}
/* Mqueue fd reference count */
void
mqueue_r
efer
(
int
sysFd
)
void
MqueueR
efer
(
int
sysFd
)
{
struct
mqarray
*
mqueueCB
=
NULL
;
struct
mqpersonal
*
privateMqPersonal
=
NULL
;
...
...
@@ -317,10 +351,11 @@ void mqueue_refer(int sysFd)
if
(
mqueueCB
==
NULL
)
{
goto
OUT_UNLOCK
;
}
privateMqPersonal
->
mq_refcount
++
;
mqueueCB
->
unlink_ref
++
;
OUT_UNLOCK:
(
VOID
)
pthread_mutex_unlock
(
&
g_mqueueMutex
);
return
;
}
STATIC
INT32
MqTryClose
(
struct
mqpersonal
*
privateMqPersonal
)
...
...
@@ -339,15 +374,6 @@ STATIC INT32 MqTryClose(struct mqpersonal *privateMqPersonal)
return
FALSE
;
}
STATIC
INT32
MqTryUnlink
(
struct
mqarray
*
mqueueCB
)
{
if
(
mqueueCB
->
unlink_ref
==
0
)
{
return
TRUE
;
}
mqueueCB
->
unlink_ref
--
;
return
FALSE
;
}
/* Set the mode data bit,for consumer's mode comparing. */
STATIC
INT32
MqueueModeAnalysisSet
(
struct
mqpersonal
*
privateMqPersonal
)
{
...
...
@@ -494,6 +520,9 @@ mqd_t mq_open(const char *mqName, int openFlag, ...)
}
/* Set mode data bit ,just for the first node */
if
(
MqueueModeAnalysisSet
(
privateMqPersonal
))
{
if
((
INT32
)(
UINTPTR
)
privateMqPersonal
>
0
)
{
(
VOID
)
DoMqueueClose
(
privateMqPersonal
);
}
goto
OUT
;
}
}
else
{
...
...
@@ -502,15 +531,18 @@ mqd_t mq_open(const char *mqName, int openFlag, ...)
}
privateMqPersonal
=
DoMqueueOpen
(
mqueueCB
,
openFlag
);
}
OUT:
if
((
INT32
)(
UINTPTR
)
privateMqPersonal
>
0
)
{
/* alloc sysFd */
sysFd
=
MqAllocSysFd
(
MAX_MQ_FD
,
privateMqPersonal
);
if
(
sysFd
==
-
1
)
{
/* there are no more mq sysFd to use, close the personal */
(
VOID
)
DoMqueueClose
(
privateMqPersonal
);
errno
=
ENFILE
;
}
mqFd
=
(
mqd_t
)
sysFd
;
}
OUT:
(
VOID
)
pthread_mutex_unlock
(
&
g_mqueueMutex
);
return
mqFd
;
}
...
...
@@ -518,9 +550,7 @@ OUT:
int
mq_close
(
mqd_t
personal
)
{
INT32
ret
=
-
1
;
struct
mqarray
*
mqueueCB
=
NULL
;
struct
mqpersonal
*
privateMqPersonal
=
NULL
;
struct
mqpersonal
*
tmp
=
NULL
;
(
VOID
)
pthread_mutex_lock
(
&
g_mqueueMutex
);
...
...
@@ -534,47 +564,18 @@ int mq_close(mqd_t personal)
errno
=
EBADF
;
goto
OUT_UNLOCK
;
}
/* there have other thread used the fd */
if
(
!
MqTryClose
(
privateMqPersonal
))
{
ret
=
0
;
goto
OUT_UNLOCK
;
}
mqueueCB
=
privateMqPersonal
->
mq_posixdes
;
if
(
mqueueCB
->
mq_personal
==
NULL
)
{
errno
=
EBADF
;
goto
OUT_UNLOCK
;
}
/* find the personal and remove */
if
(
mqueueCB
->
mq_personal
==
privateMqPersonal
)
{
mqueueCB
->
mq_personal
=
privateMqPersonal
->
mq_next
;
}
else
{
for
(
tmp
=
mqueueCB
->
mq_personal
;
tmp
->
mq_next
!=
NULL
;
tmp
=
tmp
->
mq_next
)
{
if
(
tmp
->
mq_next
==
privateMqPersonal
)
{
break
;
}
}
if
(
tmp
->
mq_next
==
NULL
)
{
errno
=
EBADF
;
goto
OUT_UNLOCK
;
}
tmp
->
mq_next
=
privateMqPersonal
->
mq_next
;
}
/* flag no use */
privateMqPersonal
->
mq_status
=
0
;
MqFreeSysFd
(
mqueueCB
,
personal
);
/* free the personal */
ret
=
LOS_MemFree
(
OS_SYS_MEM_ADDR
,
privateMqPersonal
);
if
(
ret
!=
LOS_OK
)
{
errno
=
EFAULT
;
ret
=
-
1
;
ret
=
DoMqueueClose
(
privateMqPersonal
);
if
(
ret
<
0
)
{
goto
OUT_UNLOCK
;
}
MqFreeSysFd
(
personal
);
if
((
mqueueCB
->
unlinkflag
==
TRUE
)
&&
(
mqueueCB
->
mq_personal
==
NULL
))
{
ret
=
DoMqueueDelete
(
mqueueCB
);
}
OUT_UNLOCK:
(
VOID
)
pthread_mutex_unlock
(
&
g_mqueueMutex
);
return
ret
;
...
...
@@ -667,10 +668,7 @@ int mq_unlink(const char *mqName)
errno
=
ENOENT
;
goto
ERROUT_UNLOCK
;
}
if
(
!
MqTryUnlink
(
mqueueCB
))
{
(
VOID
)
pthread_mutex_unlock
(
&
g_mqueueMutex
);
return
0
;
}
if
(
mqueueCB
->
mq_personal
!=
NULL
)
{
mqueueCB
->
unlinkflag
=
TRUE
;
}
else
if
(
mqueueCB
->
unlink_ref
==
0
)
{
...
...
fs/vfs/operation/vfs_procfd.c
浏览文件 @
339e937a
...
...
@@ -318,7 +318,7 @@ static void FdRefer(int sysFd)
#endif
#if defined(LOSCFG_COMPAT_POSIX)
if
((
sysFd
>=
MQUEUE_FD_OFFSET
)
&&
(
sysFd
<
(
MQUEUE_FD_OFFSET
+
CONFIG_NQUEUE_DESCRIPTORS
)))
{
mqueue_r
efer
(
sysFd
);
MqueueR
efer
(
sysFd
);
}
#endif
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录