diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 22 |
2 files changed, 13 insertions, 15 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index f4f77aa..ce3cfc9 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,11 @@ 2017-12-02 Simon Marchi <simon.marchi@polymtl.ca> + * linux-low.c (linux_detach_lwp_callback): Return void, remove + args parameter, don't check for pid. + (linux_detach): Use for_each_thread. + +2017-12-02 Simon Marchi <simon.marchi@polymtl.ca> + * linux-low.c (struct counter): Remove. (second_thread_of_pid_p): Remove. (last_thread_of_process_p): Use find_thread. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 2e63468..c495c24 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1581,28 +1581,20 @@ linux_detach_one_lwp (struct lwp_info *lwp) delete_lwp (lwp); } -/* Callback for find_inferior. Detaches from non-leader threads of a +/* Callback for for_each_thread. Detaches from non-leader threads of a given process. */ -static int -linux_detach_lwp_callback (thread_info *thread, void *args) +static void +linux_detach_lwp_callback (thread_info *thread) { - struct lwp_info *lwp = get_thread_lwp (thread); - int pid = *(int *) args; - int lwpid = lwpid_of (thread); - - /* Skip other processes. */ - if (thread->id.pid () != pid) - return 0; - /* We don't actually detach from the thread group leader just yet. If the thread group exits, we must reap the zombie clone lwps before we're able to reap the leader. */ - if (thread->id.pid () == lwpid) - return 0; + if (thread->id.pid () == thread->id.lwp ()) + return; + lwp_info *lwp = get_thread_lwp (thread); linux_detach_one_lwp (lwp); - return 0; } static int @@ -1636,7 +1628,7 @@ linux_detach (int pid) /* Detach from the clone lwps first. If the thread group exits just while we're detaching, we must reap the clone lwps before we're able to reap the leader. */ - find_inferior (&all_threads, linux_detach_lwp_callback, &pid); + for_each_thread (pid, linux_detach_lwp_callback); main_lwp = find_lwp_pid (pid_to_ptid (pid)); linux_detach_one_lwp (main_lwp); |