This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: RFC: gdb_assert with 'catch signal ...' and fork
- From: Philippe Waroquiers <philippe dot waroquiers at skynet dot be>
- To: gdb-patches at sourceware dot org
- Date: Sat, 04 May 2013 00:43:38 +0200
- Subject: Re: RFC: gdb_assert with 'catch signal ...' and fork
- References: <1367620645 dot 2243 dot 49 dot camel at soleil>
On Sat, 2013-05-04 at 00:37 +0200, Philippe Waroquiers wrote:
> The patch below modifies catch-signal.c, catch-signal.exp
> and modifies breakpoint.c so as to avoid the assert.
Forgot to give -up option, here is the same with -up
Index: gdb/breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.759
diff -u -p -r1.759 breakpoint.c
--- gdb/breakpoint.c 24 Apr 2013 23:09:31 -0000 1.759
+++ gdb/breakpoint.c 3 May 2013 22:39:48 -0000
@@ -3550,6 +3550,9 @@ detach_breakpoints (ptid_t ptid)
if (bl->pspace != inf->pspace)
continue;
+ if (bl->owner->type == bp_catchpoint)
+ continue;
+
if (bl->inserted)
val |= remove_breakpoint_1 (bl, mark_inserted);
}
Index: gdb/testsuite/gdb.base/catch-signal.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/catch-signal.c,v
retrieving revision 1.3
diff -u -p -r1.3 catch-signal.c
--- gdb/testsuite/gdb.base/catch-signal.c 3 May 2013 19:16:56 -0000 1.3
+++ gdb/testsuite/gdb.base/catch-signal.c 3 May 2013 22:39:48 -0000
@@ -15,6 +15,7 @@
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>
@@ -44,5 +45,17 @@ main ()
raise (SIGHUP); /* fourth HUP */
raise (SIGINT); /* first INT */
+
+ signal (SIGCHLD, handle);
+ switch (fork()) /* fork marker */
+ {
+ case -1:
+ perror ("fork");
+ exit (1);
+ case 0:
+ exit (0);
+ }
+ (void) wait(NULL);
+ raise (SIGHUP); /* fifth HUP */
}
Index: gdb/testsuite/gdb.base/catch-signal.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/catch-signal.exp,v
retrieving revision 1.4
diff -u -p -r1.4 catch-signal.exp
--- gdb/testsuite/gdb.base/catch-signal.exp 3 May 2013 19:16:56 -0000 1.4
+++ gdb/testsuite/gdb.base/catch-signal.exp 3 May 2013 22:39:48 -0000
@@ -83,7 +83,16 @@ proc test_catch_signal {signame} {
y
gdb_test "catch signal SIGINT" "Catchpoint .*"
gdb_test "continue" "Catchpoint .* SIGINT.*"
+
+ delete_breakpoints
+ # Test interaction with fork. This used to cause a gdb_assert.
+ gdb_breakpoint ${srcfile}:[gdb_get_line_number "fork marker"]
+ gdb_continue_to_breakpoint "fork marker"
+ gdb_test "handle SIGHUP nostop noprint pass" \
+ "SIGHUP.*No.*No.*Yes.*"
+ gdb_test "catch signal SIGHUP" "Catchpoint .*"
+ gdb_test "continue" "Catchpoint .* SIGHUP.*" "got SIGHUP after fork"
}
}