Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
缘_顺
rt-thread
提交
24fee46e
R
rt-thread
项目概览
缘_顺
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
24fee46e
编写于
2月 25, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
2月 25, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2359 from RT-Thread/fix_signal
[Kernel] fix signal issue
上级
745659c4
5ae62d0f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
92 addition
and
57 deletion
+92
-57
src/scheduler.c
src/scheduler.c
+7
-15
src/signal.c
src/signal.c
+85
-42
未找到文件。
src/scheduler.c
浏览文件 @
24fee46e
...
...
@@ -234,7 +234,7 @@ void rt_schedule(void)
if
(
rt_interrupt_nest
==
0
)
{
extern
void
rt_thread_handle_sig
(
rt_bool_t
clean_state
);
extern
void
rt_thread_handle_sig
(
void
);
rt_hw_context_switch
((
rt_uint32_t
)
&
from_thread
->
sp
,
(
rt_uint32_t
)
&
to_thread
->
sp
);
...
...
@@ -243,9 +243,10 @@ void rt_schedule(void)
rt_hw_interrupt_enable
(
level
);
#ifdef RT_USING_SIGNALS
/*
check signal status
*/
rt_thread_handle_sig
(
RT_TRUE
);
/*
handle signal
*/
rt_thread_handle_sig
();
#endif
return
;
}
else
{
...
...
@@ -253,21 +254,12 @@ void rt_schedule(void)
rt_hw_context_switch_interrupt
((
rt_uint32_t
)
&
from_thread
->
sp
,
(
rt_uint32_t
)
&
to_thread
->
sp
);
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
}
}
else
{
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
}
}
else
{
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
}
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
}
/*
...
...
src/signal.c
浏览文件 @
24fee46e
...
...
@@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2017/10/5 Bernard the first version
* 2019/02/15 Jesven fixed the problem of si_list
*/
#include <stdint.h>
...
...
@@ -37,7 +38,7 @@ struct siginfo_node
static
struct
rt_mempool
*
_rt_siginfo_pool
;
static
void
_signal_deliver
(
rt_thread_t
tid
);
void
rt_thread_handle_sig
(
rt_bool_t
clean_state
);
void
rt_thread_handle_sig
(
void
);
static
void
_signal_default_handler
(
int
signo
)
{
...
...
@@ -47,22 +48,37 @@ static void _signal_default_handler(int signo)
static
void
_signal_entry
(
void
*
parameter
)
{
register
rt_base_t
level
;
rt_thread_t
tid
=
rt_thread_self
();
dbg_enter
;
/* handle signal */
rt_thread_handle_sig
(
RT_FALSE
);
while
(
1
)
{
level
=
rt_hw_interrupt_disable
();
if
(
tid
->
stat
&
RT_THREAD_STAT_SIGNAL
)
{
rt_hw_interrupt_enable
(
level
);
/* handle signal */
rt_thread_handle_sig
();
}
else
{
/*
* Note: interrupt is disabled and no reentrant issue.
*
* no signal status in tid->stat.
*/
break
;
}
}
/* never come back... */
rt_hw_interrupt_disable
();
/* return to thread */
tid
->
sp
=
tid
->
sig_ret
;
tid
->
sig_ret
=
RT_NULL
;
LOG_D
(
"switch back to: 0x%08x"
,
tid
->
sp
);
tid
->
stat
&=
~
RT_THREAD_STAT_SIGNAL
;
rt_hw_context_switch_to
((
rt_uint32_t
)
&
(
tid
->
sp
));
}
...
...
@@ -80,10 +96,15 @@ static void _signal_deliver(rt_thread_t tid)
{
rt_ubase_t
level
;
level
=
rt_hw_interrupt_disable
();
/* thread is not interested in pended signals */
if
(
!
(
tid
->
sig_pending
&
tid
->
sig_mask
))
return
;
if
(
!
(
tid
->
sig_pending
&
tid
->
sig_mask
))
{
rt_hw_interrupt_enable
(
level
);
return
;
}
level
=
rt_hw_interrupt_disable
();
if
((
tid
->
stat
&
RT_THREAD_STAT_MASK
)
==
RT_THREAD_SUSPEND
)
{
/* resume thread to handle signal */
...
...
@@ -106,7 +127,7 @@ static void _signal_deliver(rt_thread_t tid)
rt_hw_interrupt_enable
(
level
);
/* do signal action in self thread context */
rt_thread_handle_sig
(
RT_TRUE
);
rt_thread_handle_sig
();
}
else
if
(
!
((
tid
->
stat
&
RT_THREAD_STAT_SIGNAL_MASK
)
&
RT_THREAD_STAT_SIGNAL
))
{
...
...
@@ -133,12 +154,13 @@ static void _signal_deliver(rt_thread_t tid)
rt_sighandler_t
rt_signal_install
(
int
signo
,
rt_sighandler_t
handler
)
{
rt_base_t
level
;
rt_sighandler_t
old
=
RT_NULL
;
rt_thread_t
tid
=
rt_thread_self
();
if
(
!
sig_valid
(
signo
))
return
SIG_ERR
;
rt_enter_critical
();
level
=
rt_hw_interrupt_disable
();
if
(
tid
->
sig_vectors
==
RT_NULL
)
{
rt_thread_alloc_sig
(
tid
);
...
...
@@ -152,7 +174,7 @@ rt_sighandler_t rt_signal_install(int signo, rt_sighandler_t handler)
else
if
(
handler
==
SIG_DFL
)
tid
->
sig_vectors
[
signo
]
=
_signal_default_handler
;
else
tid
->
sig_vectors
[
signo
]
=
handler
;
}
rt_
exit_critical
(
);
rt_
hw_interrupt_enable
(
level
);
return
old
;
}
...
...
@@ -270,7 +292,20 @@ __done:
LOG_D
(
"sigwait: %d sig raised!"
,
signo
);
if
(
si_prev
)
si_prev
->
list
.
next
=
si_node
->
list
.
next
;
else
tid
->
si_list
=
si_node
->
list
.
next
;
else
{
struct
siginfo_node
*
node_next
;
if
(
si_node
->
list
.
next
)
{
node_next
=
(
void
*
)
rt_slist_entry
(
si_node
->
list
.
next
,
struct
siginfo_node
,
list
);
tid
->
si_list
=
node_next
;
}
else
{
tid
->
si_list
=
RT_NULL
;
}
}
/* clear pending */
tid
->
sig_pending
&=
~
sig_mask
(
signo
);
...
...
@@ -279,7 +314,14 @@ __done:
}
si_prev
=
si_node
;
si_node
=
(
void
*
)
rt_slist_entry
(
si_node
->
list
.
next
,
struct
siginfo_node
,
list
);
if
(
si_node
->
list
.
next
)
{
si_node
=
(
void
*
)
rt_slist_entry
(
si_node
->
list
.
next
,
struct
siginfo_node
,
list
);
}
else
{
si_node
=
RT_NULL
;
}
}
__done_int:
...
...
@@ -289,7 +331,7 @@ __done_return:
return
ret
;
}
void
rt_thread_handle_sig
(
rt_bool_t
clean_state
)
void
rt_thread_handle_sig
(
void
)
{
rt_base_t
level
;
...
...
@@ -297,6 +339,7 @@ void rt_thread_handle_sig(rt_bool_t clean_state)
struct
siginfo_node
*
si_node
;
level
=
rt_hw_interrupt_disable
();
if
(
tid
->
sig_pending
&
tid
->
sig_mask
)
{
/* if thread is not waiting for signal */
...
...
@@ -318,13 +361,13 @@ void rt_thread_handle_sig(rt_bool_t clean_state)
signo
=
si_node
->
si
.
si_signo
;
handler
=
tid
->
sig_vectors
[
signo
];
tid
->
sig_pending
&=
~
sig_mask
(
signo
);
rt_hw_interrupt_enable
(
level
);
LOG_D
(
"handle signal: %d, handler 0x%08x"
,
signo
,
handler
);
if
(
handler
)
handler
(
signo
);
level
=
rt_hw_interrupt_disable
();
tid
->
sig_pending
&=
~
sig_mask
(
signo
);
error
=
-
RT_EINTR
;
rt_mp_free
(
si_node
);
/* release this siginfo node */
...
...
@@ -332,11 +375,10 @@ void rt_thread_handle_sig(rt_bool_t clean_state)
tid
->
error
=
error
;
}
/*
whether clean signal status
*/
if
(
clean_state
==
RT_TRUE
)
tid
->
stat
&=
~
RT_THREAD_STAT_SIGNAL
;
/*
clean state
*/
tid
->
stat
&=
~
RT_THREAD_STAT_SIGNAL
;
}
}
rt_hw_interrupt_enable
(
level
);
}
...
...
@@ -362,30 +404,30 @@ void rt_thread_alloc_sig(rt_thread_t tid)
void
rt_thread_free_sig
(
rt_thread_t
tid
)
{
rt_base_t
level
;
struct
siginfo_node
*
si_
list
;
struct
siginfo_node
*
si_
node
;
rt_sighandler_t
*
sig_vectors
;
level
=
rt_hw_interrupt_disable
();
si_
list
=
(
struct
siginfo_node
*
)
tid
->
si_list
;
si_
node
=
(
struct
siginfo_node
*
)
tid
->
si_list
;
tid
->
si_list
=
RT_NULL
;
sig_vectors
=
tid
->
sig_vectors
;
tid
->
sig_vectors
=
RT_NULL
;
rt_hw_interrupt_enable
(
level
);
if
(
si_
list
)
if
(
si_
node
)
{
struct
rt_slist_node
*
node
;
struct
siginfo_node
*
si_nod
e
;
struct
rt_slist_node
*
node_to_fre
e
;
LOG_D
(
"free signal info list"
);
node
=
&
(
si_
list
->
list
);
node
=
&
(
si_
node
->
list
);
do
{
si_node
=
rt_slist_entry
(
node
,
struct
siginfo_node
,
list
);
rt_mp_free
(
si_node
);
node_to_free
=
node
;
node
=
node
->
next
;
si_node
=
rt_slist_entry
(
node_to_free
,
struct
siginfo_node
,
list
);
rt_mp_free
(
si_node
);
}
while
(
node
);
}
...
...
@@ -416,30 +458,23 @@ int rt_thread_kill(rt_thread_t tid, int sig)
struct
rt_slist_node
*
node
;
struct
siginfo_node
*
entry
;
node
=
(
struct
rt_slist_node
*
)
tid
->
si_list
;
rt_hw_interrupt_enable
(
level
);
si_node
=
(
struct
siginfo_node
*
)
tid
->
si_list
;
if
(
si_node
)
node
=
(
struct
rt_slist_node
*
)
&
si_node
->
list
;
else
node
=
RT_NULL
;
/* update sig info */
rt_enter_critical
();
for
(;
(
node
)
!=
RT_NULL
;
node
=
node
->
next
)
{
entry
=
rt_slist_entry
(
node
,
struct
siginfo_node
,
list
);
if
(
entry
->
si
.
si_signo
==
sig
)
{
memcpy
(
&
(
entry
->
si
),
&
si
,
sizeof
(
siginfo_t
));
rt_
exit_critical
(
);
rt_
hw_interrupt_enable
(
level
);
return
0
;
}
}
rt_exit_critical
();
/* disable interrupt to protect tcb */
level
=
rt_hw_interrupt_disable
();
}
else
{
/* a new signal */
tid
->
sig_pending
|=
sig_mask
(
sig
);
}
rt_hw_interrupt_enable
(
level
);
...
...
@@ -450,14 +485,22 @@ int rt_thread_kill(rt_thread_t tid, int sig)
memcpy
(
&
(
si_node
->
si
),
&
si
,
sizeof
(
siginfo_t
));
level
=
rt_hw_interrupt_disable
();
if
(
!
tid
->
si_list
)
tid
->
si_list
=
si_node
;
else
if
(
tid
->
si_list
)
{
struct
siginfo_node
*
si_list
;
si_list
=
(
struct
siginfo_node
*
)
tid
->
si_list
;
rt_slist_append
(
&
(
si_list
->
list
),
&
(
si_node
->
list
));
}
else
{
tid
->
si_list
=
si_node
;
}
/* a new signal */
tid
->
sig_pending
|=
sig_mask
(
sig
);
rt_hw_interrupt_enable
(
level
);
}
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录