From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14691 invoked by alias); 25 Mar 2009 17:49:26 -0000 Received: (qmail 14683 invoked by uid 22791); 25 Mar 2009 17:49:25 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 25 Mar 2009 17:49:19 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D070B2BAC04 for ; Wed, 25 Mar 2009 13:49:17 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id T+7alVQT0cA1 for ; Wed, 25 Mar 2009 13:49:17 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 9103C2BAC02 for ; Wed, 25 Mar 2009 13:49:17 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 386BD5BD21; Wed, 25 Mar 2009 10:49:11 -0700 (PDT) Date: Wed, 25 Mar 2009 18:00:00 -0000 From: Joel Brobecker To: gdb-patches@sourceware.org Subject: [RFA/commit] Minor cleanup in breakpoint_thread_match Message-ID: <20090325174911.GA9472@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="SO98HVl1bnMOfKZd" Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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: 2009-03/txt/msg00555.txt.bz2 --SO98HVl1bnMOfKZd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 983 This is in preparation for adding handling of (Ada) task-specific breakpoints in this routine. I could have just modified the condition inside the loop, but it was getting too nested for my taste, making the condition hard to read. So here's a cleanup that would provide two improvements: readability, and computing of the ptid's thread-id in a lazy way. Most of the time, at least for myself, I don't use thread-specific breakpoints, so might as well not compute the thread ID. Reference: http://www.sourceware.org/ml/gdb-patches/2009-03/msg00551.html 2009-03-25 Joel Brobecker * breakpoint.c (breakpoint_thread_match): Split a large condition into several smaller conditions. No behavior change. Tested on x86_64-linux. I made this change in a pretty procedural and mechanical way. But a second pair of eyes would be appreciated. Plus, I'd like to know if others also prefer splitting this condition like I did. Thanks, -- Joel --SO98HVl1bnMOfKZd Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="bp-cleanup.diff" Content-length: 1273 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 7e50342..6b88601 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1893,20 +1893,28 @@ int breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid) { const struct bp_location *bpt; - int thread; - - thread = pid_to_thread_id (ptid); - + /* The thread ID associated to PTID, computed lazily. */ + int thread = -1; + ALL_BP_LOCATIONS (bpt) { if (bpt->loc_type != bp_loc_software_breakpoint && bpt->loc_type != bp_loc_hardware_breakpoint) continue; - if ((breakpoint_enabled (bpt->owner) - || bpt->owner->enable_state == bp_permanent) - && bpt->address == pc - && (bpt->owner->thread == -1 || bpt->owner->thread == thread)) + if (!breakpoint_enabled (bpt->owner) + && bpt->owner->enable_state != bp_permanent) + continue; + + if (bpt->address != pc) + continue; + + /* If this is a thread-specific breakpoint, and we haven't + computed the ptid's thread ID yet, compute it now. */ + if (bpt->owner->thread != -1 && thread == -1) + thread = pid_to_thread_id (ptid); + + if (bpt->owner->thread == -1 || bpt->owner->thread == thread) { if (overlay_debugging && section_is_overlay (bpt->section) --SO98HVl1bnMOfKZd--