Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/: Relasted to last big change to force interrupts to be disabled. In the SMP case, we still must call leave_critical_section() at least once in order to compensate for the fact that the irqcount was incremented in up_schedsigaction().

Browse Source
This commit is contained in:
Gregory Nutt
2018-06-06 17:03:42 -06:00
parent 5b96a26c1b
commit a581d7c2e3
7 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/common/xtensa_schedsigaction.c
+6 -2
View File
@@ -119,7 +119,9 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
if (!CURRENT_REGS)
{
/* In this case just deliver the signal now. */
/* In this case just deliver the signal now.
* REVISIT: Signal handler will run in a critical section!
*/
sigdeliver(tcb);
}
@@ -235,7 +237,9 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
if (cpu == me && !CURRENT_REGS)
{
/* In this case just deliver the signal now. */
/* In this case just deliver the signal now.
* REVISIT: Signal handler will run in a critical section!
*/
sigdeliver(tcb);
}
arch/xtensa/src/common/xtensa_sigdeliver.c
+15
View File
@@ -100,9 +100,24 @@ void xtensa_sig_deliver(void)
sigdeliver = rtcb->xcp.sigdeliver;
rtcb->xcp.sigdeliver = NULL;
#ifdef CONFIG_SMP
/* In the SMP case, up_schedule_sigaction(0) will have incremented
* 'irqcount' in order to force us into a critical section. At a minimum,
* we must call leave_critical_section() at least once in order to
* compensate for that.
*/
leave_critical_section((regs[REG_PS]));
#endif /* CONFIG_SMP */
#ifndef CONFIG_SUPPRESS_INTERRUPTS
/* Then make sure that interrupts are enabled. Signal handlers must always
* run with interrupts enabled.
*
* REVISIT: 'irqcount' could still be greater than zero in the SMP case.
* This would be an issue if the signal handler were to suspend because
* the critical section would be re-established when the signal handler
* resumes.
*/
up_irq_enable();