Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-03-27 09:32:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3199 from BernardXiong/fix_signal_issue

Browse Source 
[Kernel] Fix the signal issue when the context switch is triggered bu…
This commit is contained in:
Bernard Xiong
2019-11-13 08:59:39 +08:00
committed by GitHub
parent 939e2486c3 6fca4a7722
commit 69e8c0324e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scheduler.c
View File

@@ -384,7 +384,12 @@ void rt_schedule(void)
}
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
#ifdef RT_USING_SIGNALS
/* check stat of thread for signal */
level = rt_hw_interrupt_disable();
if (current_thread->stat & RT_THREAD_STAT_SIGNAL_PENDING)
{
extern void rt_thread_handle_sig(rt_bool_t clean_state);
@@ -400,9 +405,6 @@ void rt_schedule(void)
{
rt_hw_interrupt_enable(level);
}
#else
/* enable interrupt */
rt_hw_interrupt_enable(level);
#endif
__exit:
@@ -487,7 +489,13 @@ void rt_schedule(void)
rt_hw_context_switch((rt_ubase_t)&from_thread->sp,
(rt_ubase_t)&to_thread->sp);
/* enable interrupt */
rt_hw_interrupt_enable(level);
#ifdef RT_USING_SIGNALS
/* check stat of thread for signal */
level = rt_hw_interrupt_disable();
if (rt_current_thread->stat & RT_THREAD_STAT_SIGNAL_PENDING)
{
extern void rt_thread_handle_sig(rt_bool_t clean_state);
@@ -503,9 +511,6 @@ void rt_schedule(void)
{
rt_hw_interrupt_enable(level);
}
#else
/* enable interrupt */
rt_hw_interrupt_enable(level);
#endif
goto __exit;
}