From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29906 invoked by alias); 10 Nov 2011 20:23:48 -0000 Received: (qmail 29897 invoked by uid 22791); 10 Nov 2011 20:23:46 -0000 X-SWARE-Spam-Status: No, hits=-7.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 Nov 2011 20:23:33 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pAAKNRfS005960 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Nov 2011 15:23:27 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pAAKNQhm015769; Thu, 10 Nov 2011 15:23:26 -0500 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id pAAKNNYf016445; Thu, 10 Nov 2011 15:23:24 -0500 From: Tom Tromey To: "Ulrich Weigand" Cc: pedro@codesourcery.com (Pedro Alves), gdb-patches@sourceware.org Subject: Re: RFC: don't set the pspace on ordinary breakpoints References: <201111101757.pAAHvaCl032698@d06av02.portsmouth.uk.ibm.com> Date: Thu, 10 Nov 2011 20:23:00 -0000 In-Reply-To: (Tom Tromey's message of "Thu, 10 Nov 2011 12:27:04 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00298.txt.bz2 Tom> Sounds good to me. I removed the loop and will retest shortly. Here is a new version that removes the extra hunk that Pedro noticed, and that removes the loop from disable_breakpoints_before_startup. Now I wonder whether also removing the loop from enable_breakpoints_after_startup is advisable. It seems less problematic, though. Built and regtested on x86-64 F15. Tom 2011-10-28 Tom Tromey * breakpoint.h (enum enable_state) : Remove. * breakpoint.c (should_be_inserted): Explicitly check if program space is executing startup. (describe_other_breakpoints): Update. (disable_breakpoints_before_startup): Change executing_startup earlier. Remove loop. (enable_breakpoints_after_startup): Change executing_startup earlier. Use location's pspace. (init_breakpoint_sal): Don't use bp_startup_disabled. (create_breakpoint): Don't use bp_startup_disabled. (update_global_location_list): Use should_be_inserted. (bkpt_re_set): Update. >From 11d2f10808089e9501760e7c486af6b9b72b04ab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 10 Nov 2011 08:55:34 -0700 Subject: [PATCH 1/3] remove bp_startup_disabled --- gdb/ChangeLog | 15 ++++++++++++ gdb/breakpoint.c | 63 ++++++++++++----------------------------------------- gdb/breakpoint.h | 8 ------ 3 files changed, 30 insertions(+), 56 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8c98bef..17c5b6c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1568,6 +1568,9 @@ should_be_inserted (struct bp_location *bl) if (!bl->enabled || bl->shlib_disabled || bl->duplicate) return 0; + if (user_breakpoint_p (bl->owner) && bl->pspace->executing_startup) + 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 @@ -5313,8 +5316,7 @@ describe_other_breakpoints (struct gdbarch *gdbarch, printf_filtered (" (thread %d)", b->thread); printf_filtered ("%s%s ", ((b->enable_state == bp_disabled - || b->enable_state == bp_call_disabled - || b->enable_state == bp_startup_disabled) + || b->enable_state == bp_call_disabled) ? " (disabled)" : b->enable_state == bp_permanent ? " (permanent)" @@ -6933,48 +6935,29 @@ enable_watchpoints_after_interactive_call_stop (void) void disable_breakpoints_before_startup (void) { - struct breakpoint *b; - int found = 0; - - ALL_BREAKPOINTS (b) - { - if (b->pspace != current_program_space) - continue; - - if ((b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint) - && breakpoint_enabled (b)) - { - b->enable_state = bp_startup_disabled; - found = 1; - } - } - - if (found) - update_global_location_list (0); - current_program_space->executing_startup = 1; + update_global_location_list (0); } void enable_breakpoints_after_startup (void) { - struct breakpoint *b; + struct bp_location *loc, **locp_tmp; int found = 0; current_program_space->executing_startup = 0; - ALL_BREAKPOINTS (b) + ALL_BP_LOCATIONS (loc, locp_tmp) { - if (b->pspace != current_program_space) + if (loc->pspace != current_program_space) continue; - if ((b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint) - && b->enable_state == bp_startup_disabled) + if ((loc->owner->type == bp_breakpoint + || loc->owner->type == bp_hardware_breakpoint) + && breakpoint_enabled (loc->owner)) { - b->enable_state = bp_enabled; found = 1; + break; } } @@ -7256,11 +7239,6 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch, "tracepoint marker to probe")); } - if (enabled && b->pspace->executing_startup - && (b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint)) - b->enable_state = bp_startup_disabled; - loc = b->loc; } else @@ -7983,11 +7961,6 @@ create_breakpoint (struct gdbarch *gdbarch, b->pspace = current_program_space; b->py_bp_object = NULL; - if (enabled && b->pspace->executing_startup - && (b->type == bp_breakpoint - || b->type == bp_hardware_breakpoint)) - b->enable_state = bp_startup_disabled; - if (!internal) /* Do not mention breakpoints with a negative number, but do notify observers. */ @@ -10607,13 +10580,8 @@ update_global_location_list (int should_insert) struct breakpoint *b = loc->owner; struct bp_location **loc_first_p; - if (b->enable_state == bp_disabled - || b->enable_state == bp_call_disabled - || b->enable_state == bp_startup_disabled - || !loc->enabled - || loc->shlib_disabled - || !breakpoint_address_is_meaningful (b) - || is_tracepoint (b)) + if (!should_be_inserted (loc) + || !breakpoint_address_is_meaningful (b)) continue; /* Permanent breakpoint should always be inserted. */ @@ -10891,8 +10859,7 @@ static struct breakpoint_ops base_breakpoint_ops = static void bkpt_re_set (struct breakpoint *b) { - /* Do not attempt to re-set breakpoints disabled during startup. */ - if (b->enable_state == bp_startup_disabled) + if (current_program_space->executing_startup) return; /* FIXME: is this still reachable? */ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index fe381df..d9060cf 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -186,14 +186,6 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another eventpoint). */ - bp_startup_disabled, /* The eventpoint has been disabled during - inferior startup. This is necessary on - some targets where the main executable - will get relocated during startup, making - breakpoint addresses invalid. The - eventpoint will be automatically enabled - and reset once inferior startup is - complete. */ bp_permanent /* There is a breakpoint instruction hard-wired into the target's code. Don't try to write another breakpoint -- 1.7.6.4