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

sched/group/group_killchildren.c: Force-cancel children if parent is force-cancelled

Browse Source 
There is no point in waiting for children to exit if the parent is force-cancelled

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
This commit is contained in:
Jukka Laitinen 2024-03-19 12:06:34 +02:00 committed by Alan Carvalho de Assis
parent 401b3e682c
commit 7c6b6171f5
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sched/group/group_killchildren.c
View File

@ -181,30 +181,34 @@ int group_kill_children(FAR struct tcb_s *tcb)
#if defined(CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS) && \
CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS != 0
/* Send SIGTERM for each first */
group_foreachchild(tcb->group, group_kill_children_handler,
(FAR void *)((uintptr_t)tcb->pid));
/* Wait a bit for child exit */
ret = CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS;
while (1)
if ((tcb->flags & TCB_FLAG_FORCED_CANCEL) == 0)
{
if (sq_empty(&tcb->group->tg_members) ||
sq_is_singular(&tcb->group->tg_members))
{
break;
}
/* Send SIGTERM for each first */
nxsig_usleep(USEC_PER_MSEC);
group_foreachchild(tcb->group, group_kill_children_handler,
(FAR void *)((uintptr_t)tcb->pid));
/* Wait a bit for child exit */
ret = CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS;
while (1)
{
if (sq_empty(&tcb->group->tg_members) ||
sq_is_singular(&tcb->group->tg_members))
{
break;
}
nxsig_usleep(USEC_PER_MSEC);
# if CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS > 0
if (--ret < 0)
{
break;
}
if (--ret < 0)
{
break;
}
# endif
}
}
#endif