From 6b2a85daf5a5c20c6d4832de1f19109d9e1cf17a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 2 Dec 2017 20:36:37 -0500 Subject: [PATCH] Remove usage of find_inferior in linux_mourn Replace with for_each_thread with pid filtering. The callback becomes trivial enough that it's better to inline it. gdb/gdbserver/ChangeLog: * linux-low.c (delete_lwp_callback): Remove. (linux_mourn): Use for_each_thread. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-low.c | 17 ++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index ce3cfc993df..faee0c6496e 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2017-12-02 Simon Marchi + + * linux-low.c (delete_lwp_callback): Remove. + (linux_mourn): Use for_each_thread. + 2017-12-02 Simon Marchi * linux-low.c (linux_detach_lwp_callback): Return void, remove diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index c495c241457..498af11a791 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1643,18 +1643,6 @@ linux_detach (int pid) /* Remove all LWPs that belong to process PROC from the lwp list. */ -static int -delete_lwp_callback (thread_info *thread, void *proc) -{ - struct lwp_info *lwp = get_thread_lwp (thread); - struct process_info *process = (struct process_info *) proc; - - if (pid_of (thread) == pid_of (process)) - delete_lwp (lwp); - - return 0; -} - static void linux_mourn (struct process_info *process) { @@ -1664,7 +1652,10 @@ linux_mourn (struct process_info *process) thread_db_mourn (process); #endif - find_inferior (&all_threads, delete_lwp_callback, process); + for_each_thread (process->pid, [] (thread_info *thread) + { + delete_lwp (get_thread_lwp (thread)); + }); /* Freeing all private data. */ priv = process->priv; -- 2.30.2