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

…force-cancelled This allows forcefully killing the children e.g. from within an exception, where one can't wait for children to die. Signed-off-by: Jukka Laitinen <[email protected]>
tiiuae · Mar 19, 2024 · b524715 · b524715
1 parent de7c2c2
commit b524715
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/sched/group/group_killchildren.c b/sched/group/group_killchildren.c
@@ -181,29 +181,33 @@ 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));
+  if ((tcb->flags & TCB_FLAG_FORCED_CANCEL) == 0)
+    {
+      /* Send SIGTERM for each first */
 
-  /* Wait a bit for child exit */
+      group_foreachchild(tcb->group, group_kill_children_handler,
+                         (FAR void *)((uintptr_t)tcb->pid));
 
-  ret = CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS;
-  while (1)
-    {
-      if (tcb->group->tg_nmembers <= 1)
+      /* Wait a bit for child exit */
+
+      ret = CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS;
+      while (1)
         {
-          break;
-        }
+          if (tcb->group->tg_nmembers <= 1)
+            {
+              break;
+            }
 
-      nxsig_usleep(USEC_PER_MSEC);
+          nxsig_usleep(USEC_PER_MSEC);
 
 #  if CONFIG_GROUP_KILL_CHILDREN_TIMEOUT_MS > 0
-      if (--ret < 0)
-        {
-          break;
-        }
+          if (--ret < 0)
+            {
+              break;
+            }
 #  endif
+        }
     }
 #endif