diff options
| author | Pedro Alves <palves@redhat.com> | 2009-11-15 20:08:03 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2009-11-15 20:08:03 +0000 |
| commit | 56710373a0ab471d0891ad49b5c2a70f53cfc00d (patch) | |
| tree | 56dd84ef4a022e7b9126349c55a3a44bb97b6f74 /gdb/breakpoint.c | |
| parent | 8a9eab9b5ee88bda4d83a237e3a3c0723530a51e (diff) | |
| download | gdb-56710373a0ab471d0891ad49b5c2a70f53cfc00d.zip gdb-56710373a0ab471d0891ad49b5c2a70f53cfc00d.tar.gz gdb-56710373a0ab471d0891ad49b5c2a70f53cfc00d.tar.bz2 | |
* 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) <breakpoints_not_allowed>:
New field.
* infrun.c (handle_inferior_event): Clear it.
* linux-nat.c (linux_child_follow_fork): Set it.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index cadc536..0034338 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; |