From 8c25b49760b854d0b8451e8ecffeb9860fc41158 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 10 Apr 2017 14:39:41 +0100 Subject: [PATCH] Hoist code on marking thread as exited This patch hoists code on marking thread as exited, so more code is shared for two different paths (thread_info is deleted or is not deleted). gdb: 2017-04-10 Yao Qi * thread.c (delete_thread_1): Hoist code on marking thread as exited. --- gdb/ChangeLog | 5 +++++ gdb/thread.c | 33 ++++++++++++--------------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f08f5201d1..a1f8b49eab 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-04-10 Yao Qi + + * thread.c (delete_thread_1): Hoist code on marking thread as + exited. + 2017-04-09 Simon Marchi * windows-nat.c (windows_detach): Initialize ptid with diff --git a/gdb/thread.c b/gdb/thread.c index 24347dd6e6..2e9da53ef0 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -434,35 +434,26 @@ delete_thread_1 (ptid_t ptid, int silent) if (tp->step_over_next != NULL) thread_step_over_chain_remove (tp); + if (tp->state != THREAD_EXITED) + { + observer_notify_thread_exit (tp, silent); + + /* Tag it as exited. */ + tp->state = THREAD_EXITED; + + /* Clear breakpoints, etc. associated with this thread. */ + clear_thread_inferior_resources (tp); + } + /* If this is the current thread, or there's code out there that - relies on it existing (refcount > 0) we can't delete yet. Mark - it as exited, and notify it. */ + relies on it existing (refcount > 0) we can't delete yet. */ if (tp->refcount > 0 || ptid_equal (tp->ptid, inferior_ptid)) { - if (tp->state != THREAD_EXITED) - { - observer_notify_thread_exit (tp, silent); - - /* Tag it as exited. */ - tp->state = THREAD_EXITED; - - /* Clear breakpoints, etc. associated with this thread. */ - clear_thread_inferior_resources (tp); - } - /* Will be really deleted some other time. */ return; } - /* Notify thread exit, but only if we haven't already. */ - if (tp->state != THREAD_EXITED) - observer_notify_thread_exit (tp, silent); - - /* Tag it as exited. */ - tp->state = THREAD_EXITED; - clear_thread_inferior_resources (tp); - if (tpprev) tpprev->next = tp->next; else