From 5f960e007db0868b854c3b796d665d816f89a9b8 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Thu, 8 Feb 2007 16:25:25 +0000 Subject: [PATCH] Reviewed by Daniel Jacobowitz 2008-02-08 Fred Fish * event-top.c (handle_sigint): Set quit_flag. (async_request_quit): Don't set quit_flag. Avoid calling quit() if quit_flag has already been reset. --- gdb/ChangeLog | 6 ++++++ gdb/event-top.c | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cfb9cdbc61d..51f64d98a82 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2008-02-08 Fred Fish + + * event-top.c (handle_sigint): Set quit_flag. + (async_request_quit): Don't set quit_flag. Avoid calling quit() + if quit_flag has already been reset. + 2007-02-08 Daniel Jacobowitz * ser-mingw.c (pipe_windows_close): Move variable initialization back diff --git a/gdb/event-top.c b/gdb/event-top.c index 400c8127a61..9a6c2fbc184 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -961,6 +961,13 @@ handle_sigint (int sig) { signal (sig, handle_sigint); + /* We could be running in a loop reading in symfiles or something so + it may be quite a while before we get back to the event loop. So + set quit_flag to 1 here. Then if QUIT is called before we get to + the event loop, we will unwind as expected. */ + + quit_flag = 1; + /* If immediate_quit is set, we go ahead and process the SIGINT right away, even if we usually would defer this to the event loop. The assumption here is that it is safe to process ^C immediately if @@ -989,7 +996,14 @@ handle_sigterm (int sig) void async_request_quit (gdb_client_data arg) { - quit_flag = 1; + /* If the quit_flag has gotten reset back to 0 by the time we get + back here, that means that an exception was thrown to unwind + the current command before we got back to the event loop. So + there is no reason to call quit again here. */ + + if (quit_flag == 0) + return; + quit (); } -- 2.30.2