OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some comments

This commit is contained in:
Gregory Nutt 2016-11-16 19:11:31 -06:00
parent 4ca653a1cc
commit f1e4951a8d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sched/irq/irq_csection.c
View File

@ -102,8 +102,8 @@ irqstate_t enter_critical_section(void)
ret = up_irq_save(); ret = up_irq_save();
/* Verify that the system has sufficient initialized so that the task lists /* Verify that the system has sufficiently initialized so that the task
* are valid. * lists are valid.
*/ */
if (g_os_initstate >= OSINIT_TASKLISTS) if (g_os_initstate >= OSINIT_TASKLISTS)
@ -115,12 +115,13 @@ irqstate_t enter_critical_section(void)
if (up_interrupt_context()) if (up_interrupt_context())
{ {
/* We are in an interrupt handler but within a critical section. How /* We are in an interrupt handler. How can this happen?
* can this happen?
* *
* 1. We are not in a critical section, OR * 1. We were not in a critical section when the interrupt
* 2. We are in critical section, but up_irq_restore only disables * occurred, OR
* interrupts and this interrupt is from the other CPU. * 2. We were in critical section, but up_irq_restore only
* disabled local interrupts on a different CPU;
* Interrupts could still be enabled on this CPU.
* *
* Assert if these conditions are not true. * Assert if these conditions are not true.
*/ */
@ -148,7 +149,7 @@ irqstate_t enter_critical_section(void)
* IRQ lock count. * IRQ lock count.
* *
* NOTE: If irqcount > 0 then (1) we are in a critical section, and * NOTE: If irqcount > 0 then (1) we are in a critical section, and
* this CPU should hold the lock. * (2) this CPU should hold the lock.
*/ */
DEBUGASSERT(spin_islocked(&g_cpu_irqlock) && DEBUGASSERT(spin_islocked(&g_cpu_irqlock) &&
@ -161,7 +162,7 @@ irqstate_t enter_critical_section(void)
/* If we get here with irqcount == 0, then we know that the /* If we get here with irqcount == 0, then we know that the
* current task running on this CPU is not in a current * current task running on this CPU is not in a current
* section. However other tasks on other CPUs may be in a * section. However other tasks on other CPUs may be in a
* critical setion. If so, we must wait until they release * critical section. If so, we must wait until they release
* the spinlock. * the spinlock.
*/ */
@ -198,7 +199,7 @@ irqstate_t enter_critical_section(void)
#else /* defined(CONFIG_SCHED_INSTRUMENTATION_CSECTION) */ #else /* defined(CONFIG_SCHED_INSTRUMENTATION_CSECTION) */
irqstate_t enter_critical_section(void) irqstate_t enter_critical_section(void)
{ {
/* Check if we were called from an interrupt handler and that the tasks /* Check if we were called from an interrupt handler and that the task
* lists have been initialized. * lists have been initialized.
*/ */
@ -230,8 +231,8 @@ irqstate_t enter_critical_section(void)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
void leave_critical_section(irqstate_t flags) void leave_critical_section(irqstate_t flags)
{ {
/* Verify that the system has sufficient initialized so that the task lists /* Verify that the system has sufficiently initialized so that the task
* are valid. * lists are valid.
*/ */
if (g_os_initstate >= OSINIT_TASKLISTS) if (g_os_initstate >= OSINIT_TASKLISTS)
@ -247,7 +248,7 @@ void leave_critical_section(irqstate_t flags)
{ {
/* We are in an interrupt handler. Release the spinlock. */ /* We are in an interrupt handler. Release the spinlock. */
DEBUGASSERT(g_cpu_irqlock == SP_LOCKED); DEBUGASSERT(spin_islocked(&g_cpu_irqlock));
spin_lock(&g_cpu_irqsetlock); /* Protects g_cpu_irqset */ spin_lock(&g_cpu_irqsetlock); /* Protects g_cpu_irqset */
if (g_cpu_irqset == 0) if (g_cpu_irqset == 0)
@ -273,7 +274,7 @@ void leave_critical_section(irqstate_t flags)
{ {
/* Yes... the spinlock should remain set */ /* Yes... the spinlock should remain set */
DEBUGASSERT(g_cpu_irqlock == SP_LOCKED); DEBUGASSERT(spin_islocked(&g_cpu_irqlock));
rtcb->irqcount--; rtcb->irqcount--;
} }
else else