gdb/patches/gdb-6.8-quit-never-aborts.patch

   1 We may abort the process of detaching threads with multiple SIGINTs - which are
   2 being sent during a testcase terminating its child GDB.
   3
   4 Some of the threads may not be properly PTRACE_DETACHed which hurts if they
   5 should have been detached with SIGSTOP (as they are accidentally left running
   6 on the debugger termination).
   7
   8 Index: gdb-7.2.50.20110117/gdb/defs.h
   9 ===================================================================
  10 --- gdb-7.2.50.20110117.orig/gdb/defs.h 2011-01-17 15:47:37.000000000 +0100
  11 +++ gdb-7.2.50.20110117/gdb/defs.h      2011-01-17 15:53:05.000000000 +0100
  12 @@ -165,6 +165,7 @@ extern char *python_libdir;
  13  extern char *debug_file_directory;
  14
  15  extern int quit_flag;
  16 +extern int quit_flag_cleanup;
  17  extern int immediate_quit;
  18  extern int sevenbit_strings;
  19
  20 @@ -178,7 +179,7 @@ extern void quit (void);
  21     needed.  */
  22
  23  #define QUIT { \
  24 -  if (quit_flag) quit (); \
  25 +  if (quit_flag && !quit_flag_cleanup) quit (); \
  26    if (deprecated_interactive_hook) deprecated_interactive_hook (); \
  27  }
  28
  29 Index: gdb-7.2.50.20110117/gdb/event-top.c
  30 ===================================================================
  31 --- gdb-7.2.50.20110117.orig/gdb/event-top.c    2011-01-17 15:52:39.000000000 +0100
  32 +++ gdb-7.2.50.20110117/gdb/event-top.c 2011-01-17 15:52:49.000000000 +0100
  33 @@ -904,7 +904,7 @@ async_request_quit (gdb_client_data arg)
  34       is no reason to call quit again here, unless immediate_quit is
  35       set.  */
  36
  37 -  if (quit_flag || immediate_quit)
  38 +  if ((quit_flag || immediate_quit) && !quit_flag_cleanup)
  39      quit ();
  40  }
  41
  42 Index: gdb-7.2.50.20110117/gdb/top.c
  43 ===================================================================
  44 --- gdb-7.2.50.20110117.orig/gdb/top.c  2011-01-17 15:47:37.000000000 +0100
  45 +++ gdb-7.2.50.20110117/gdb/top.c       2011-01-17 15:52:49.000000000 +0100
  46 @@ -1257,7 +1257,9 @@ quit_force (char *args, int from_tty)
  47    qt.args = args;
  48    qt.from_tty = from_tty;
  49
  50 -  /* We want to handle any quit errors and exit regardless.  */
  51 +  /* We want to handle any quit errors and exit regardless but we should never
  52 +     get user-interrupted to properly detach the inferior.  */
  53 +  quit_flag_cleanup = 1;
  54    catch_errors (quit_target, &qt,
  55                 "Quitting: ", RETURN_MASK_ALL);
  56
  57 Index: gdb-7.2.50.20110117/gdb/utils.c
  58 ===================================================================
  59 --- gdb-7.2.50.20110117.orig/gdb/utils.c        2011-01-17 15:47:37.000000000 +0100
  60 +++ gdb-7.2.50.20110117/gdb/utils.c     2011-01-17 15:52:49.000000000 +0100
  61 @@ -121,6 +121,11 @@ int job_control;
  62
  63  int quit_flag;
  64
  65 +/* Nonzero means we are already processing the quitting cleanups and we should
  66 +   no longer get aborted.  */
  67 +
  68 +int quit_flag_cleanup;
  69 +
  70  /* Nonzero means quit immediately if Control-C is typed now, rather
  71     than waiting until QUIT is executed.  Be careful in setting this;
  72     code which executes with immediate_quit set has to be very careful