nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

group_signal_handler: Remove a redundant check

Browse source 
We know tcb is not NULL here as we have a DIAGASSERT on it
immediately above.
This commit is contained in:
YAMAMOTO Takashi 2024-11-15 15:52:18 +09:00 committed by Xiang Xiao
parent 6d629b3b36
commit ab3b128805
1 changed files with 56 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
sched/group/group_signal.c
View file

@ -85,30 +85,69 @@ static int group_signal_handler(pid_t pid, FAR void *arg)
tcb = nxsched_get_tcb(pid); tcb = nxsched_get_tcb(pid);
DEBUGASSERT(tcb != NULL && tcb->group != NULL && info != NULL); DEBUGASSERT(tcb != NULL && tcb->group != NULL && info != NULL);
if (tcb) /* Set this one as the default if we have not already set the
* default.
*/
if (!info->dtcb)
{ {
/* Set this one as the default if we have not already set the info->dtcb = tcb;
* default. }
/* Is the thread waiting for this signal (in this case, the signal is
* probably blocked).
*/
ret = nxsig_ismember(&tcb->sigwaitmask, info->siginfo->si_signo);
if (ret == 1 && (!info->atcb || info->siginfo->si_signo == SIGCHLD))
{
/* Yes.. This means that the task is suspended, waiting for this
* signal to occur. Stop looking and use this TCB. The
* requirement is this: If a task group receives a signal and
* more than one thread is waiting on that signal, then one and
* only one indeterminate thread out of that waiting group will
* receive the signal.
*/ */
if (!info->dtcb) ret = nxsig_tcbdispatch(tcb, info->siginfo);
if (ret < 0)
{ {
info->dtcb = tcb; return ret;
} }
/* Is the thread waiting for this signal (in this case, the signal is /* Limit to one thread */
* probably blocked).
info->atcb = tcb;
if (info->ptcb != NULL && info->siginfo->si_signo != SIGCHLD)
{
return 1; /* Terminate the search */
}
}
/* Is this signal unblocked on this thread? */
if (!nxsig_ismember(&tcb->sigprocmask, info->siginfo->si_signo) &&
!info->ptcb && tcb != info->atcb)
{
/* Yes.. remember this TCB if we have not encountered any
* other threads that have the signal unblocked.
*/ */
ret = nxsig_ismember(&tcb->sigwaitmask, info->siginfo->si_signo); if (!info->utcb)
if (ret == 1 && (!info->atcb || info->siginfo->si_signo == SIGCHLD))
{ {
/* Yes.. This means that the task is suspended, waiting for this info->utcb = tcb;
* signal to occur. Stop looking and use this TCB. The }
* requirement is this: If a task group receives a signal and
* more than one thread is waiting on that signal, then one and /* Is there also a action associated with the task group? */
* only one indeterminate thread out of that waiting group will
* receive the signal. sigact = nxsig_find_action(tcb->group, info->siginfo->si_signo);
if (sigact)
{
/* Yes.. then use this thread. The requirement is this:
* If a task group receives a signal then one and only one
* indeterminate thread in the task group which is not
* blocking the signal will receive the signal.
*/ */
ret = nxsig_tcbdispatch(tcb, info->siginfo); ret = nxsig_tcbdispatch(tcb, info->siginfo);
@ -119,54 +158,12 @@ static int group_signal_handler(pid_t pid, FAR void *arg)
/* Limit to one thread */ /* Limit to one thread */
info->atcb = tcb; info->ptcb = tcb;
if (info->atcb != NULL)
if (info->ptcb != NULL && info->siginfo->si_signo != SIGCHLD)
{ {
return 1; /* Terminate the search */ return 1; /* Terminate the search */
} }
} }
/* Is this signal unblocked on this thread? */
if (!nxsig_ismember(&tcb->sigprocmask, info->siginfo->si_signo) &&
!info->ptcb && tcb != info->atcb)
{
/* Yes.. remember this TCB if we have not encountered any
* other threads that have the signal unblocked.
*/
if (!info->utcb)
{
info->utcb = tcb;
}
/* Is there also a action associated with the task group? */
sigact = nxsig_find_action(tcb->group, info->siginfo->si_signo);
if (sigact)
{
/* Yes.. then use this thread. The requirement is this:
* If a task group receives a signal then one and only one
* indeterminate thread in the task group which is not
* blocking the signal will receive the signal.
*/
ret = nxsig_tcbdispatch(tcb, info->siginfo);
if (ret < 0)
{
return ret;
}
/* Limit to one thread */
info->ptcb = tcb;
if (info->atcb != NULL)
{
return 1; /* Terminate the search */
}
}
}
} }
return 0; /* Keep searching */ return 0; /* Keep searching */