sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "SMP: Fix a error introduced in 36b676eea6 and fully decouple disabling of pre-emption from critical sections."

Browse Source 
This reverts commit 9aedf1bdec.
This commit is contained in:
Gregory Nutt 2016-12-26 07:48:22 -06:00
parent b0fcf3abd7
commit d45a81d643
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sched/irq/irq_csection.c
View File

@ -507,6 +507,36 @@ void leave_critical_section(irqstate_t flags)
rtcb->irqcount = 0;
spin_clrbit(&g_cpu_irqset, cpu, &g_cpu_irqsetlock,
&g_cpu_irqlock);
/* Have all CPUs released the lock? */
if (!spin_islocked(&g_cpu_irqlock))
{
/* Check if there are pending tasks and that pre-emption
* is also enabled.
*
* REVISIT: Is there an issue here? up_release_pending()
* must be called from within a critical section but here
* we have just left the critical section. At least we
* still have interrupts disabled on this CPU.
*/
if (g_pendingtasks.head != NULL &&
!spin_islocked(&g_cpu_schedlock))
{
/* Release any ready-to-run tasks that have collected
* in g_pendingtasks if the scheduler is not locked.
*
* NOTE: This operation has a very high likelihood of
* causing this task to be switched out!
*
* REVISIT: Should this not be done while we are in the
* critical section.
*/
up_release_pending();
}
}
}
}
}

10
sched/sched/sched_unlock.c
View File

@ -102,8 +102,7 @@ int sched_unlock(void)
#ifdef CONFIG_SMP
/* The lockcount has decremented to zero and we need to perform
* release our hold on the lock. Pre-emption may still be locked
* from other CPUs.
* release our hold on the lock.
*/
DEBUGASSERT(g_cpu_schedlock == SP_LOCKED &&
@ -119,12 +118,13 @@ int sched_unlock(void)
*
* NOTE: This operation has a very high likelihood of causing
* this task to be switched out!
*
* NOTE: In SMP mode, pre-emption may still be locked due to
* operations on other CPUs.
*/
#ifdef CONFIG_SMP
if (!spin_islocked(&g_cpu_schedlock) && g_pendingtasks.head != NULL)
#else
if (g_pendingtasks.head != NULL)
#endif
{
up_release_pending();
}