diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 14 | ||||
| -rw-r--r-- | gdb/gdbserver/spu-low.c | 5 |
4 files changed, 9 insertions, 23 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 42b30a4549b..a29ee23b430 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2011-05-04 Doug Evans <dje@google.com> + + * linux-low.c (linux_join): Skip process lookup. + * spu-low.c (spu_join): Ditto. + * server.c (join_inferiors_callback): Delete. + (process_serial_event): For 'D' packet (detach) call join_inferior + directly. + 2011-05-04 Joseph Myers <joseph@codesourcery.com> * README: Don't mention xscale*-*-linux*. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 23554db5d99..d84fd680b73 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -878,11 +878,6 @@ static void linux_join (int pid) { int status, ret; - struct process_info *process; - - process = find_process_pid (pid); - if (process == NULL) - return; do { ret = my_waitpid (pid, &status, 0); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 8b9133b0346..6bf6eaac004 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -2442,17 +2442,6 @@ detach_or_kill_for_exit (void) for_each_inferior (&all_processes, detach_or_kill_inferior_callback); } -static void -join_inferiors_callback (struct inferior_list_entry *entry) -{ - struct process_info *process = (struct process_info *) entry; - - /* If we are attached, then we can exit. Otherwise, we need to hang - around doing nothing, until the child is gone. */ - if (!process->attached) - join_inferior (ptid_get_pid (process->head.id)); -} - int main (int argc, char *argv[]) { @@ -2851,8 +2840,7 @@ process_serial_event (void) /* If we are attached, then we can exit. Otherwise, we need to hang around doing nothing, until the child is gone. */ - for_each_inferior (&all_processes, - join_inferiors_callback); + join_inferior (pid); exit (0); } } diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c index 93ed75a4efc..898e46d6f7e 100644 --- a/gdb/gdbserver/spu-low.c +++ b/gdb/gdbserver/spu-low.c @@ -365,11 +365,6 @@ static void spu_join (int pid) { int status, ret; - struct process_info *process; - - process = find_process_pid (pid); - if (process == NULL) - return; do { ret = waitpid (pid, &status, 0); |