]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] Report detached thread exit to the debugger
authorAndrew Morton <akpm@osdl.org>
Wed, 2 Jul 2003 15:48:52 +0000 (08:48 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Wed, 2 Jul 2003 15:48:52 +0000 (08:48 -0700)
From: Daniel Jacobowitz <dan@debian.org>

Right now, CLONE_DETACHED threads silently vanish from GDB's sight when
they exit.  This patch lets the thread report its exit to the debugger, and
then be auto-reaped as soon as it is collected, instead of being reaped as
soon as it exits and not reported at all.

GDB works either way, but this is more correct and will be useful for some
later GDB patches.

kernel/exit.c

index 367854d246efd7ab21ddde27bbe86dab0a0ebcb7..2f090213e4811c284cbaf000292d898ce24d971b 100644 (file)
@@ -651,6 +651,8 @@ static void exit_notify(struct task_struct *tsk)
        if (tsk->exit_signal != -1) {
                int signal = tsk->parent == tsk->real_parent ? tsk->exit_signal : SIGCHLD;
                do_notify_parent(tsk, signal);
+       } else if (tsk->ptrace) {
+               do_notify_parent(tsk, SIGCHLD);
        }
 
        tsk->state = TASK_ZOMBIE;
@@ -715,7 +717,7 @@ NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        exit_notify(tsk);
 
-       if (tsk->exit_signal == -1)
+       if (tsk->exit_signal == -1 && tsk->ptrace == 0)
                release_task(tsk);
 
        schedule();
@@ -859,7 +861,7 @@ static int wait_task_zombie(task_t *p, unsigned int *stat_addr, struct rusage *r
                BUG_ON(state != TASK_DEAD);
                return 0;
        }
-       if (unlikely(p->exit_signal == -1))
+       if (unlikely(p->exit_signal == -1 && p->ptrace == 0))
                /*
                 * This can only happen in a race with a ptraced thread
                 * dying on another processor.
@@ -889,8 +891,12 @@ static int wait_task_zombie(task_t *p, unsigned int *stat_addr, struct rusage *r
                /* Double-check with lock held.  */
                if (p->real_parent != p->parent) {
                        __ptrace_unlink(p);
-                       do_notify_parent(p, p->exit_signal);
                        p->state = TASK_ZOMBIE;
+                       /* If this is a detached thread, this is where it goes away.  */
+                       if (p->exit_signal == -1)
+                               release_task (p);
+                       else
+                               do_notify_parent(p, p->exit_signal);
                        p = NULL;
                }
                write_unlock_irq(&tasklist_lock);