From 785922a559529420ce9b11342d7abe6ad32b3595 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 15 Sep 2017 14:53:07 +0200 Subject: [PATCH] gdbserver: Remove duplicate functions to find any thread of process We have about 6 functions/callbacks to find_inferior meant to find a thread that belongs to a given pid. Remove all but find_any_thread_of_pid and replace their uses with find_any_thread_of_pid. gdb/gdbserver/ChangeLog: * server.c (first_thread_of): Remove. (process_serial_event): Replace usage of first_thread_of with find_any_thread_of_pid. * tracepoint.c (same_process_p): Remove. (gdb_agent_about_to_close): Replace usage of same_process_p with find_any_thread_of_pid. * linux-x86-low.c (same_process_callback): Remove. (x86_arch_setup_process_callback): Replace usage of same_process_callback with find_any_thread_of_pid. * thread-db.c (any_thread_of): Remove. (switch_to_process): Replace usage of any_thread_of with find_any_thread_of_pid. * inferiors.c (thread_pid_matches_callback): Remove. (find_thread_process): Adjust to use find_any_thread_of_pid. --- gdb/gdbserver/ChangeLog | 17 +++++++++++++++++ gdb/gdbserver/inferiors.c | 14 +------------- gdb/gdbserver/linux-x86-low.c | 15 +-------------- gdb/gdbserver/server.c | 19 +++---------------- gdb/gdbserver/thread-db.c | 15 +-------------- gdb/gdbserver/tracepoint.c | 14 +------------- 6 files changed, 24 insertions(+), 70 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d9f80c9cf2..c4576fd8c8 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,20 @@ +2017-09-15 Simon Marchi + + * server.c (first_thread_of): Remove. + (process_serial_event): Replace usage of first_thread_of with + find_any_thread_of_pid. + * tracepoint.c (same_process_p): Remove. + (gdb_agent_about_to_close): Replace usage of same_process_p with + find_any_thread_of_pid. + * linux-x86-low.c (same_process_callback): Remove. + (x86_arch_setup_process_callback): Replace usage of + same_process_callback with find_any_thread_of_pid. + * thread-db.c (any_thread_of): Remove. + (switch_to_process): Replace usage of any_thread_of with + find_any_thread_of_pid. + * inferiors.c (thread_pid_matches_callback): Remove. + (find_thread_process): Adjust to use find_any_thread_of_pid. + 2017-09-10 Sergio Durigan Junior * regcache.c (get_thread_regcache): Guard calls to "memset" diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 3c171a179e..2212850764 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -141,25 +141,13 @@ find_thread_ptid (ptid_t ptid) return (struct thread_info *) find_inferior_id (&all_threads, ptid); } -/* Predicate function for matching thread entry's pid to the given - pid value passed by address in ARGS. */ - -static int -thread_pid_matches_callback (struct inferior_list_entry *entry, void *args) -{ - return (ptid_get_pid (entry->id) == *(pid_t *)args); -} - /* Find a thread associated with the given PROCESS, or NULL if no such thread exists. */ static struct thread_info * find_thread_process (const struct process_info *const process) { - pid_t pid = ptid_get_pid (ptid_of (process)); - - return (struct thread_info *) - find_inferior (&all_threads, thread_pid_matches_callback, &pid); + return find_any_thread_of_pid (process->entry.id.pid ()); } /* Helper for find_any_thread_of_pid. Returns true if a thread diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 844a165666..49f6b2d489 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -846,17 +846,6 @@ x86_linux_read_description (void) gdb_assert_not_reached ("failed to return tdesc"); } -/* Callback for find_inferior. Stops iteration when a thread with a - given PID is found. */ - -static int -same_process_callback (struct inferior_list_entry *entry, void *data) -{ - int pid = *(int *) data; - - return (ptid_get_pid (entry->id) == pid); -} - /* Callback for for_each_inferior. Calls the arch_setup routine for each process. */ @@ -866,9 +855,7 @@ x86_arch_setup_process_callback (struct inferior_list_entry *entry) int pid = ptid_get_pid (entry->id); /* Look up any thread of this processes. */ - current_thread - = (struct thread_info *) find_inferior (&all_threads, - same_process_callback, &pid); + current_thread = find_any_thread_of_pid (pid); the_low_target.arch_setup (); } diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 56c6393a4e..bedb87bce7 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -3450,17 +3450,6 @@ gdbserver_show_disableable (FILE *stream) break; \ } -static int -first_thread_of (struct inferior_list_entry *entry, void *args) -{ - int pid = * (int *) args; - - if (ptid_get_pid (entry->id) == pid) - return 1; - - return 0; -} - static void kill_inferior_callback (struct inferior_list_entry *entry) { @@ -4162,11 +4151,9 @@ process_serial_event (void) && ptid_equal (pid_to_ptid (pid), gdb_id)) { - struct thread_info *thread = - (struct thread_info *) find_inferior (&all_threads, - first_thread_of, - &pid); - if (!thread) + thread_info *thread = find_any_thread_of_pid (pid); + + if (thread == NULL) { write_enn (own_buf); break; diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index 1ffb79d5c1..9b867b8785 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -733,25 +733,12 @@ thread_db_init (void) return 0; } -static int -any_thread_of (struct inferior_list_entry *entry, void *args) -{ - int *pid_p = (int *) args; - - if (ptid_get_pid (entry->id) == *pid_p) - return 1; - - return 0; -} - static void switch_to_process (struct process_info *proc) { int pid = pid_of (proc); - current_thread = - (struct thread_info *) find_inferior (&all_threads, - any_thread_of, &pid); + current_thread = find_any_thread_of_pid (pid); } /* Disconnect from libthread_db and free resources. */ diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 68ce10f5ef..0f41ff4c42 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -3956,17 +3956,6 @@ cmd_qtstmat (char *packet) run_inferior_command (packet, strlen (packet) + 1); } -/* Helper for gdb_agent_about_to_close. - Return non-zero if thread ENTRY is in the same process in DATA. */ - -static int -same_process_p (struct inferior_list_entry *entry, void *data) -{ - int *pid = (int *) data; - - return ptid_get_pid (entry->id) == *pid; -} - /* Sent the agent a command to close it. */ void @@ -3981,8 +3970,7 @@ gdb_agent_about_to_close (int pid) saved_thread = current_thread; /* Find any thread which belongs to process PID. */ - current_thread = (struct thread_info *) - find_inferior (&all_threads, same_process_p, &pid); + current_thread = find_any_thread_of_pid (pid); strcpy (buf, "close"); -- 2.34.1