b0e03f562d
- Fix callback-mode readline-6.0 regression for CTRL-C (for RHEL-6.0). - Fix occasional NULL dereference of the readline-6.0 workaround (BZ 575516).
73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
We may abort the process of detaching threads with multiple SIGINTs - which are
|
|
being sent during a testcase terminating its child GDB.
|
|
|
|
Some of the threads may not be properly PTRACE_DETACHed which hurts if they
|
|
should have been detached with SIGSTOP (as they are accidentally left running
|
|
on the debugger termination).
|
|
|
|
Index: gdb-7.2.50.20110117/gdb/defs.h
|
|
===================================================================
|
|
--- gdb-7.2.50.20110117.orig/gdb/defs.h 2011-01-17 15:47:37.000000000 +0100
|
|
+++ gdb-7.2.50.20110117/gdb/defs.h 2011-01-17 15:53:05.000000000 +0100
|
|
@@ -165,6 +165,7 @@ extern char *python_libdir;
|
|
extern char *debug_file_directory;
|
|
|
|
extern int quit_flag;
|
|
+extern int quit_flag_cleanup;
|
|
extern int immediate_quit;
|
|
extern int sevenbit_strings;
|
|
|
|
@@ -178,7 +179,7 @@ extern void quit (void);
|
|
needed. */
|
|
|
|
#define QUIT { \
|
|
- if (quit_flag) quit (); \
|
|
+ if (quit_flag && !quit_flag_cleanup) quit (); \
|
|
if (deprecated_interactive_hook) deprecated_interactive_hook (); \
|
|
}
|
|
|
|
Index: gdb-7.2.50.20110117/gdb/event-top.c
|
|
===================================================================
|
|
--- gdb-7.2.50.20110117.orig/gdb/event-top.c 2011-01-17 15:52:39.000000000 +0100
|
|
+++ gdb-7.2.50.20110117/gdb/event-top.c 2011-01-17 15:52:49.000000000 +0100
|
|
@@ -904,7 +904,7 @@ async_request_quit (gdb_client_data arg)
|
|
is no reason to call quit again here, unless immediate_quit is
|
|
set. */
|
|
|
|
- if (quit_flag || immediate_quit)
|
|
+ if ((quit_flag || immediate_quit) && !quit_flag_cleanup)
|
|
quit ();
|
|
}
|
|
|
|
Index: gdb-7.2.50.20110117/gdb/top.c
|
|
===================================================================
|
|
--- gdb-7.2.50.20110117.orig/gdb/top.c 2011-01-17 15:47:37.000000000 +0100
|
|
+++ gdb-7.2.50.20110117/gdb/top.c 2011-01-17 15:52:49.000000000 +0100
|
|
@@ -1257,7 +1257,9 @@ quit_force (char *args, int from_tty)
|
|
qt.args = args;
|
|
qt.from_tty = from_tty;
|
|
|
|
- /* We want to handle any quit errors and exit regardless. */
|
|
+ /* We want to handle any quit errors and exit regardless but we should never
|
|
+ get user-interrupted to properly detach the inferior. */
|
|
+ quit_flag_cleanup = 1;
|
|
catch_errors (quit_target, &qt,
|
|
"Quitting: ", RETURN_MASK_ALL);
|
|
|
|
Index: gdb-7.2.50.20110117/gdb/utils.c
|
|
===================================================================
|
|
--- gdb-7.2.50.20110117.orig/gdb/utils.c 2011-01-17 15:47:37.000000000 +0100
|
|
+++ gdb-7.2.50.20110117/gdb/utils.c 2011-01-17 15:52:49.000000000 +0100
|
|
@@ -121,6 +121,11 @@ int job_control;
|
|
|
|
int quit_flag;
|
|
|
|
+/* Nonzero means we are already processing the quitting cleanups and we should
|
|
+ no longer get aborted. */
|
|
+
|
|
+int quit_flag_cleanup;
|
|
+
|
|
/* Nonzero means quit immediately if Control-C is typed now, rather
|
|
than waiting until QUIT is executed. Be careful in setting this;
|
|
code which executes with immediate_quit set has to be very careful
|