Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sched/signal/sig_dispatch.c: Clarify some logic. It is not necessary to test the TCB's TCB_FLAG_SYSCALL if syscalls are not enabled.

Browse Source
This commit is contained in:
Gregory Nutt
2019-11-29 08:11:55 -06:00
parent 16b1c276bd
commit 81790f2ca8
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/signal/sig_dispatch.c
+15 -4
View File
@@ -301,6 +301,7 @@ static void nxsig_add_pendingsignal(FAR struct tcb_s *stcb,
int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info) int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
{ {
irqstate_t flags; irqstate_t flags;
bool masked;
int ret = OK; int ret = OK;
sinfo("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n", sinfo("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
@@ -311,13 +312,23 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
/************************* MASKED SIGNAL HANDLING ************************/ /************************* MASKED SIGNAL HANDLING ************************/
/* Check if the signal is masked OR if it is received while we are masked = sigismember(&stcb->sigprocmask, info->si_signo);
#ifdef CONFIG_LIB_SYSCALL
/* Check if the signal is masked OR if the signal is received while we are
* processing a system call -- in either case, it will be added to the * processing a system call -- in either case, it will be added to the
* list of pending signals. Unmasked user signal actions will be deferred
* while we process the system call.
*/
if (masked || (stcb->flags & TCB_FLAG_SYSCALL) != 0)
#else
/* Check if the signal is masked. In that case, it will be added to the
* list of pending signals. * list of pending signals.
*/ */
if (sigismember(&stcb->sigprocmask, info->si_signo) || if (masked)
(stcb->flags & TCB_FLAG_SYSCALL) != 0) #endif
{ {
/* Check if the task is waiting for this pending signal. If so, then /* Check if the task is waiting for this pending signal. If so, then
* unblock it. This must be performed in a critical section because * unblock it. This must be performed in a critical section because
@@ -390,7 +401,7 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
* happen within a system call. * happen within a system call.
*/ */
if (!sigismember(&stcb->sigprocmask, info->si_signo)) if (!masked)
{ {
/* If the task is blocked waiting for a semaphore, then that task must /* If the task is blocked waiting for a semaphore, then that task must
* be unblocked when a signal is received. * be unblocked when a signal is received.