diff options
author | Pedro Alves <palves@redhat.com> | 2013-04-10 14:10:35 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2013-04-10 14:10:35 +0000 |
commit | 2f9d54cfcef6c6085ff4bfcbf42c963527606d89 (patch) | |
tree | ddf41b30c24fcdd146e0d03f1c2856ef1b87fb01 /gdb/infcmd.c | |
parent | eb9f3f001ff1b478f3ba245aab5b8f89ff76b456 (diff) | |
download | gdb-2f9d54cfcef6c6085ff4bfcbf42c963527606d89.zip gdb-2f9d54cfcef6c6085ff4bfcbf42c963527606d89.tar.gz gdb-2f9d54cfcef6c6085ff4bfcbf42c963527606d89.tar.bz2 |
make -gdb-exit call disconnect_tracing too, and don't lose history if the target errors on "quit"
Gareth mentions in PR gdb/15275:
"The MI '-gdb-exit' command mi_cmd_gdb_exit() never calls disconnect_tracing()
and therefore exits correctly."
It should, so to get out of tfind mode, as quit may detach instead of
kill, and we don't want to confuse the memory/register accesses
etc. of the detach process. So we should push down the disconnect
tracing bits at least to quit_force. But we can't as is, as that
would swallow the error thrown by answering "no" to:
Trace is running but will stop on detach; detach anyway? (y or n)
So to address that, we split disconnect_tracing in two. One part that
does the query, and another part that does the rest, and we make
quit_force call the latter.
Looking at quit_force, it does several things, some of which are a bit
independent of the others. It first kills/detaches, and then writes
history, and then runs the final cleanups. It seems better to me to
do each of these things even if the previous thing throws. E.g., as
is, if something throws while detaching, then we skip writing history.
Tested on x86_64 Fedora 17.
gdb/
2013-04-10 Pedro Alves <palves@redhat.com>
* cli/cli-cmds.c (quit_command): Call query_if_trace_running
instead of disconnect_tracing.
* infcmd.c (detach_command, disconnect_command): Call
query_if_trace_running. Adjust.
* top.c: Include "tracepoint.h".
(quit_target): Delete. Contents moved ...
(quit_force): ... here. Wrap each stage of teardown in
TRY_CATCH. Call disconnect_tracing before detaching.
Diffstat (limited to 'gdb/infcmd.c')
-rw-r--r-- | gdb/infcmd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gdb/infcmd.c b/gdb/infcmd.c index c60f19a..af6a4db 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -2721,7 +2721,9 @@ detach_command (char *args, int from_tty) if (ptid_equal (inferior_ptid, null_ptid)) error (_("The program is not being run.")); - disconnect_tracing (from_tty); + query_if_trace_running (from_tty); + + disconnect_tracing (); target_detach (args, from_tty); @@ -2751,7 +2753,8 @@ static void disconnect_command (char *args, int from_tty) { dont_repeat (); /* Not for the faint of heart. */ - disconnect_tracing (from_tty); + query_if_trace_running (from_tty); + disconnect_tracing (); target_disconnect (args, from_tty); no_shared_libraries (NULL, from_tty); init_thread_list (); |