From 56710373a0ab471d0891ad49b5c2a70f53cfc00d Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 15 Nov 2009 20:08:03 +0000 Subject: [PATCH] * breakpoint.c (should_be_inserted): Don't insert breakpoints if the pspace doesn't allow breakpoints. (insert_breakpoint_locations): Remove waiting_for_vfork_done special case. Expect watchpoints that shouldn't be inserted, to not be inserted. * progspace.h (struct program_space) : New field. * infrun.c (handle_inferior_event): Clear it. * linux-nat.c (linux_child_follow_fork): Set it. --- gdb/ChangeLog | 12 ++++++++++++ gdb/breakpoint.c | 32 ++++++++++++-------------------- gdb/infrun.c | 1 + gdb/linux-nat.c | 1 + gdb/progspace.h | 4 ++++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7769fff24e6..500eaf826ac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2009-11-15 Pedro Alves + + * breakpoint.c (should_be_inserted): Don't insert breakpoints if + the pspace doesn't allow breakpoints. + (insert_breakpoint_locations): Remove waiting_for_vfork_done + special case. Expect watchpoints that shouldn't be inserted, to + not be inserted. + * progspace.h (struct program_space) : + New field. + * infrun.c (handle_inferior_event): Clear it. + * linux-nat.c (linux_child_follow_fork): Set it. + 2009-11-13 Doug Evans * dcache.c (dcache_hit, dcache_read_line): Tweak comments. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index cadc5364596..0034338a0ee 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1193,6 +1193,17 @@ should_be_inserted (struct bp_location *bpt) if (!bpt->enabled || bpt->shlib_disabled || bpt->duplicate) return 0; + /* This is set for example, when we're attached to the parent of a + vfork, and have detached from the child. The child is running + free, and we expect it to do an exec or exit, at which point the + OS makes the parent schedulable again (and the target reports + that the vfork is done). Until the child is done with the shared + memory region, do not insert breakpoints in the parent, otherwise + the child could still trip on the parent's breakpoints. Since + the parent is blocked anyway, it won't miss any breakpoint. */ + if (bpt->pspace->breakpoints_not_allowed) + return 0; + /* Tracepoints are inserted by the target at a time of its choosing, not by us. */ if (bpt->owner->type == bp_tracepoint) @@ -1530,25 +1541,6 @@ insert_breakpoint_locations (void) && ptid_equal (inferior_ptid, null_ptid)) continue; - if (!ptid_equal (inferior_ptid, null_ptid)) - { - struct inferior *inf = current_inferior (); - if (inf->waiting_for_vfork_done) - { - /* This is set when we're attached to the parent of the - vfork, and have detached from the child. The child - is running free, and we expect it to do an exec or - exit, at which point the OS makes the parent - schedulable again (and the target reports that the - vfork is done). Until the child is done with the - shared memory region, do not insert breakpoints in - parent, otherwise the child could still trip on the - parent's breakpoints. Since the parent is blocked - anyway, it won't miss any breakpoint. */ - continue; - } - } - val = insert_bp_location (b, tmp_error_stream, &disabled_breaks, &hw_breakpoint_error); @@ -1573,7 +1565,7 @@ insert_breakpoint_locations (void) continue; for (loc = bpt->loc; loc; loc = loc->next) - if (!loc->inserted) + if (!loc->inserted && should_be_inserted (loc)) { some_failed = 1; break; diff --git a/gdb/infrun.c b/gdb/infrun.c index 9d8ab68cfac..c28366f5da9 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3004,6 +3004,7 @@ handle_inferior_event (struct execution_control_state *ecs) context_switch (ecs->ptid); current_inferior ()->waiting_for_vfork_done = 0; + current_inferior ()->pspace->breakpoints_not_allowed = 0; /* This also takes care of reinserting breakpoints in the previously locked inferior. */ keep_going (ecs); diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index c0c02407314..95feca6d363 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -793,6 +793,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \ subsequent child exec or exit is enough to know when does the child stops using the parent's address space. */ parent_inf->waiting_for_vfork_done = detach_fork; + parent_inf->pspace->breakpoints_not_allowed = detach_fork; lp = find_lwp_pid (pid_to_ptid (parent_pid)); gdb_assert (linux_supports_tracefork_flag >= 0); diff --git a/gdb/progspace.h b/gdb/progspace.h index 0cf1382b77a..4d87d16863b 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -165,6 +165,10 @@ struct program_space to set breakpoints point at the wrong addresses. */ int executing_startup; + /* True if no breakpoints should be inserted in this program + space. */ + int breakpoints_not_allowed; + /* The object file that the main symbol table was loaded from (e.g. the argument to the "symbol-file" or "file" command). */ struct objfile *symfile_object_file; -- 2.30.2