From 9939e1314f970c6ba568956148a518ac710a280a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 8 Jan 2014 19:16:54 +0000 Subject: [PATCH] GDBserver: Discard previous queued events when GDB disconnects. ... not when a new GDB connection sends the status packet ('?'). Mainly just a cleanup/simplification, as GDB always sends '?' first. Tested on x86_64 Fedora 17. 2014-01-08 Pedro Alves * server.c (handle_status): Don't discard previous queued stop replies or thread's pending status here. (main) : Do it here instead. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/server.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index bf874a15ea..adba6f6c73 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-01-08 Pedro Alves + + * server.c (handle_status): Don't discard previous queued stop + replies or thread's pending status here. + (main) : Do it here instead. + 2014-01-08 Pedro Alves * gdbthread.h (struct thread_info) : New field. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 5e8007511d..c9d9eec0d4 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -2635,9 +2635,6 @@ handle_status (char *own_buf) /* GDB is connected, don't forward events to the target anymore. */ for_each_inferior (&all_processes, gdb_reattached_process); - discard_queued_stop_replies (-1); - for_each_inferior (&all_threads, clear_pending_status_callback); - /* In non-stop mode, we must send a stop reply for each stopped thread. In all-stop mode, just send one for the first stopped thread we find. */ @@ -3140,6 +3137,12 @@ main (int argc, char *argv[]) "Remote side has terminated connection. " "GDBserver will reopen the connection.\n"); + /* Get rid of any pending statuses. An eventual reconnection + (by the same GDB instance or another) will refresh all its + state from scratch. */ + discard_queued_stop_replies (-1); + for_each_inferior (&all_threads, clear_pending_status_callback); + if (tracing) { if (disconnected_tracing) -- 2.34.1