libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-21 22:15:34 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2541 from BernardXiong/fix_critical_smp

Browse Source 
[Kernel] Fix the critical issue under smp
This commit is contained in:
Bernard Xiong 2019-04-04 13:37:01 +08:00 committed by GitHub
commit 3d05ec698c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/scheduler.c
View File

@ -792,6 +792,12 @@ void rt_enter_critical(void)
level = rt_hw_local_irq_disable(); level = rt_hw_local_irq_disable();
current_thread = rt_cpu_self()->current_thread; current_thread = rt_cpu_self()->current_thread;
if (!current_thread)
{
rt_hw_local_irq_enable(level);
return ;
}
/* /*
* the maximal number of nest is RT_UINT16_MAX, which is big * the maximal number of nest is RT_UINT16_MAX, which is big
* enough and does not check here * enough and does not check here
@ -842,6 +848,11 @@ void rt_exit_critical(void)
level = rt_hw_local_irq_disable(); level = rt_hw_local_irq_disable();
current_thread = rt_cpu_self()->current_thread; current_thread = rt_cpu_self()->current_thread;
if (!current_thread)
{
rt_hw_local_irq_enable(level);
return ;
}
current_thread->scheduler_lock_nest --; current_thread->scheduler_lock_nest --;
@ -873,14 +884,17 @@ void rt_exit_critical(void)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
rt_scheduler_lock_nest --; rt_scheduler_lock_nest --;
if (rt_scheduler_lock_nest <= 0) if (rt_scheduler_lock_nest <= 0)
{ {
rt_scheduler_lock_nest = 0; rt_scheduler_lock_nest = 0;
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
rt_schedule(); if (rt_current_thread)
{
/* if scheduler is started, do a schedule */
rt_schedule();
}
} }
else else
{ {