nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 10:58:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

sched: group_killchildren send signo SIGQUIT before cancel it

Browse source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2023-05-11 20:26:00 +08:00 committed by Xiang Xiao
parent 2868e28837
commit 395fa73870
2 changed files with 75 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sched/Kconfig
View file

@ -1769,3 +1769,14 @@ config SCHED_BACKTRACE
using the information automatically generated by the
compiler or architecture specific approach when ARCH_HAVE_BACKTRACE
is selected
config GROUP_KILL_CHILDREN_TIMEOUT_MS
int "Group kill children timeout"
default -1
depends on !DISABLE_PTHREAD && SIG_SIGKILL_ACTION
---help---
Kill children a SIGQUIT signal before cancel them,
< 0 means wait until all the child thread exit
> 0 means wait timeout
= 0 means don't do kill signal

65
sched/group/group_killchildren.c
View file

@ -57,7 +57,37 @@
*
****************************************************************************/
#if defined(CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS) && \
CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS != 0
static int group_kill_children_handler(pid_t pid, FAR void *arg)
{
/* Cancel all threads except for the one specified by the argument */
if (pid != (pid_t)((uintptr_t)arg))
{
pthread_kill(pid, SIGTERM);
}
return OK;
}
#endif
/****************************************************************************
* Name: group_cancel_children_handler
*
* Description:
* Callback from group_foreachchild that handles one member of the group.
*
* Input Parameters:
* pid - The ID of the group member that may be signaled.
* arg - The PID of the thread to be retained.
*
* Returned Value:
* 0 (OK) always
*
****************************************************************************/
static int group_cancel_children_handler(pid_t pid, FAR void *arg)
{
FAR struct tcb_s *rtcb;
int ret;
@ -135,6 +165,11 @@ int group_kill_children(FAR struct tcb_s *tcb)
DEBUGASSERT(tcb->group);
if (tcb->group->tg_flags & GROUP_FLAG_EXITING)
{
return 0;
}
#ifdef CONFIG_SMP
/* NOTE: sched_lock() is not enough for SMP
* because tcb->group will be accessed from the child tasks
@ -153,7 +188,35 @@ int group_kill_children(FAR struct tcb_s *tcb)
tcb->group->tg_flags |= GROUP_FLAG_EXITING;
ret = group_foreachchild(tcb->group, group_kill_children_handler,
#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->group->tg_nmembers <= 1)
break;
usleep(USEC_PER_MSEC);
# if CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS > 0
if (--ret < 0)
{
break;
}
# endif
}
#endif
/* Force cancel/delete again */
ret = group_foreachchild(tcb->group, group_cancel_children_handler,
(FAR void *)((uintptr_t)tcb->pid));
#ifdef CONFIG_SMP