Re: Fix execl.exp sporadic failures

Pedro Alves
2008-07-08T11:40:09Z

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

A Tuesday 08 July 2008 12:05:05, Pedro Alves wrote:
> Attached is what I checked in then.

Sorry, EWRONGPATCH. *This* is what I checked in.

--
Pedro Alves

[-- Attachment #2: execl.diff --]
[-- Type: text/x-diff, Size: 5221 bytes --]

Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.9522
retrieving revision 1.9523
diff -u -p -r1.9522 -r1.9523
--- ChangeLog 8 Jul 2008 10:31:15 -0000 1.9522
+++ ChangeLog 8 Jul 2008 10:59:57 -0000 1.9523
@@ -1,5 +1,16 @@
2008-07-08 Pedro Alves <pedro@codesourcery.com>

+ * breakpoint.c (mark_breakpoints_out): Make public.
+ (update_breakpoints_after_exec): Don't call mark_breakpoints_out
+ here. Update comment.
+ * breakpoint.h (mark_breakpoints_out): Declare.
+
+ * linux-nat.c (linux_handle_extended_wait): On
+ TARGET_WAITKIND_EXECD, call mark_breakpoints_out.
+ * inf-ttrace.c (inf_ttrace_wait): Likewise.
+
+2008-07-08 Pedro Alves <pedro@codesourcery.com>
+
* infrun.c (follow_exec): Reset shared libraries before adding the
main exec file.

Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- breakpoint.c 7 Jul 2008 22:39:58 -0000 1.328
+++ breakpoint.c 8 Jul 2008 10:59:57 -0000 1.329
@@ -188,8 +188,6 @@ static int single_step_breakpoint_insert

static void free_bp_location (struct bp_location *loc);

-static void mark_breakpoints_out (void);
-
static struct bp_location *
allocate_bp_location (struct breakpoint *bpt, enum bptype bp_type);

@@ -1443,12 +1441,19 @@ update_breakpoints_after_exec (void)
{
struct breakpoint *b;
struct breakpoint *temp;
+ struct bp_location *bploc;
struct cleanup *cleanup;

- /* Doing this first prevents the badness of having delete_breakpoint()
- write a breakpoint's current "shadow contents" to lift the bp. That
- shadow is NOT valid after an exec()! */
- mark_breakpoints_out ();
+ /* We're about to delete breakpoints from GDB's lists. If the
+ INSERTED flag is true, GDB will try to lift the breakpoints by
+ writing the breakpoints' "shadow contents" back into memory. The
+ "shadow contents" are NOT valid after an exec, so GDB should not
+ do that. Instead, the target is responsible from marking
+ breakpoints out as soon as it detects an exec. We don't do that
+ here instead, because there may be other attempts to delete
+ breakpoints after detecting an exec and before reaching here. */
+ ALL_BP_LOCATIONS (bploc)
+ gdb_assert (!bploc->inserted);

/* The binary we used to debug is now gone, and we're updating
breakpoints for the new binary. Until we're done, we should not
@@ -1699,7 +1704,7 @@ remove_breakpoint (struct bp_location *b

/* Clear the "inserted" flag in all breakpoints. */

-static void
+void
mark_breakpoints_out (void)
{
struct bp_location *bpt;
Index: breakpoint.h
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- breakpoint.h 28 Jun 2008 09:42:15 -0000 1.73
+++ breakpoint.h 8 Jul 2008 10:59:57 -0000 1.74
@@ -826,6 +826,9 @@ extern void disable_breakpoint (struct b

extern void enable_breakpoint (struct breakpoint *);

+/* Clear the "inserted" flag in all breakpoints. */
+extern void mark_breakpoints_out (void);
+
extern void make_breakpoint_permanent (struct breakpoint *);

extern struct breakpoint *create_solib_event_breakpoint (CORE_ADDR);
Index: inf-ttrace.c
===================================================================
RCS file: /cvs/src/src/gdb/inf-ttrace.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- inf-ttrace.c 21 Mar 2008 15:44:53 -0000 1.28
+++ inf-ttrace.c 8 Jul 2008 10:59:57 -0000 1.29
@@ -904,6 +904,12 @@ inf_ttrace_wait (ptid_t ptid, struct tar
tts.tts_u.tts_exec.tts_pathlen, 0) == -1)
perror_with_name (("ttrace"));
ourstatus->value.execd_pathname[tts.tts_u.tts_exec.tts_pathlen] = 0;
+
+ /* At this point, all inserted breakpoints are gone. Doing this
+ as soon as we detect an exec prevents the badness of deleting
+ a breakpoint writing the current "shadow contents" to lift
+ the bp. That shadow is NOT valid after an exec. */
+ mark_breakpoints_out ();
break;

case TTEVT_EXIT:
Index: linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-nat.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- linux-nat.c 28 Jun 2008 11:15:33 -0000 1.88
+++ linux-nat.c 8 Jul 2008 10:59:57 -0000 1.89