Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* RFA: fix gdb_assert caused by 'catch signal ...' and fork
@ 2013-05-09 21:56 Philippe Waroquiers
  2013-05-10 16:39 ` Doug Evans
  2013-05-10 17:20 ` Pedro Alves
  0 siblings, 2 replies; 9+ messages in thread
From: Philippe Waroquiers @ 2013-05-09 21:56 UTC (permalink / raw)
  To: gdb-patches

The attached patch fixes a gdb_assert caused by the combination of catch
signal and fork:
  break-catch-sig.c:152: internal-error: signal_catchpoint_remove_location: Assertion `signal_catch_counts[iter] > 0' failed.

The problem is that the signal_catch_counts is decremented by detach_breakpoints.
The fix consists in not detaching breakpoint locations of type bp_loc_other.
The patch introduces a new test.

Ok to commit ?

Index: gdb/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.15539
diff -u -p -r1.15539 ChangeLog
--- gdb/ChangeLog	9 May 2013 18:03:27 -0000	1.15539
+++ gdb/ChangeLog	9 May 2013 21:46:32 -0000
@@ -1,3 +1,8 @@
+2013-05-09  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+	* breakpoints.c (detach_breakpoints): Do not
+	detach breakpoints locations with loc_type bp_loc_other.
+
 2013-05-09  Doug Evans  <dje@google.com>
 
 	* symfile.c (syms_from_objfile_1): Delete args offsets, num_offsets.
Index: gdb/breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.761
diff -u -p -r1.761 breakpoint.c
--- gdb/breakpoint.c	7 May 2013 17:04:28 -0000	1.761
+++ gdb/breakpoint.c	9 May 2013 21:46:33 -0000
@@ -3537,6 +3537,9 @@ detach_breakpoints (ptid_t ptid)
     if (bl->pspace != inf->pspace)
       continue;
 
+    if (bl->loc_type == bp_loc_other)
+      continue;
+
     if (bl->inserted)
       val |= remove_breakpoint_1 (bl, mark_inserted);
   }
Index: gdb/testsuite/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v
retrieving revision 1.3653
diff -u -p -r1.3653 ChangeLog
--- gdb/testsuite/ChangeLog	8 May 2013 18:56:02 -0000	1.3653
+++ gdb/testsuite/ChangeLog	9 May 2013 21:46:36 -0000
@@ -1,3 +1,8 @@
+2013-05-09  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+	* gdb.base/catch-signal-fork.exp: New file.
+	* gdb.base/catch-signal-fork.c: New file.
+
 2013-05-08  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/solib-search.exp: Set test name for "set
Index: gdb/testsuite/gdb.base/catch-signal-fork.c
===================================================================
RCS file: gdb/testsuite/gdb.base/catch-signal-fork.c
diff -N gdb/testsuite/gdb.base/catch-signal-fork.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/catch-signal-fork.c	9 May 2013 21:46:36 -0000
@@ -0,0 +1,58 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2013-2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+void
+do_nothing (void)
+{
+}
+
+void
+handle (int sig)
+{
+  do_nothing (); /* handle marker */
+}
+
+int
+main ()
+{
+  int i;
+  signal (SIGHUP, handle);
+
+  raise (SIGHUP);		/* first HUP */
+
+  signal (SIGCHLD, handle);
+  for (i = 0; i < 3; i++)	/* fork loop */
+    {
+      switch (fork())
+	{
+	case -1:
+	  perror ("fork");
+	  exit (1);
+	case 0:
+	  exit (0);
+	}
+      (void) wait(NULL);
+    }
+
+  raise (SIGHUP);		/* second HUP */
+
+  raise (SIGHUP);		/* third HUP */
+}
+
Index: gdb/testsuite/gdb.base/catch-signal-fork.exp
===================================================================
RCS file: gdb/testsuite/gdb.base/catch-signal-fork.exp
diff -N gdb/testsuite/gdb.base/catch-signal-fork.exp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdb/testsuite/gdb.base/catch-signal-fork.exp	9 May 2013 21:46:36 -0000
@@ -0,0 +1,43 @@
+# Copyright 2013-2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if [target_info exists gdb,nosignals] {
+    verbose "Skipping catch-signal-fork.exp because of nosignals."
+    continue
+}
+
+standard_testfile
+
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
+    return -1
+}
+
+if {![runto_main]} {
+    return -1
+}
+
+# Test "catch signal SIGHUP"
+gdb_test "catch signal SIGHUP" "Catchpoint .*"
+gdb_breakpoint ${srcfile}:[gdb_get_line_number "first HUP"]
+gdb_breakpoint ${srcfile}:[gdb_get_line_number "fork loop"]
+
+gdb_continue_to_breakpoint "first HUP"
+gdb_test "continue" "Catchpoint .*"
+
+# Test interaction with fork.
+# This used to cause a gdb_assert in the code detaching the
+# breakpoints for the child.
+gdb_continue_to_breakpoint "fork loop"
+gdb_test "continue" "Catchpoint .* SIGHUP.*" "got SIGHUP after fork"



^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-05-21 18:49 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-09 21:56 RFA: fix gdb_assert caused by 'catch signal ...' and fork Philippe Waroquiers
2013-05-10 16:39 ` Doug Evans
2013-05-10 17:18   ` Pedro Alves
2013-05-10 22:14     ` Philippe Waroquiers
2013-05-11  9:10       ` Pedro Alves
2013-05-10 17:20 ` Pedro Alves
2013-05-16 20:30   ` Philippe Waroquiers
2013-05-17 18:18     ` Pedro Alves
2013-05-21 18:49       ` Philippe Waroquiers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox