This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA/commit] Minor cleanup in breakpoint_thread_match
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 25 Mar 2009 11:00:33 -0700
- Subject: Re: [RFA/commit] Minor cleanup in breakpoint_thread_match
- References: <20090325174911.GA9472@adacore.com>
> 2009-03-25 Joel Brobecker <brobecker@adacore.com>
>
> * 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.
Actually, upon rewriting the Ada patch, it occured to me that the
following is even more helpful in inserting support for task-specific
breakpoints... I'm currently testing the attached patch.
--
Joel
commit 485117c6c4ed62aed31cc919f435494eb6faad49
Author: Joel Brobecker <brobecker@adacore.com>
Date: Wed Mar 25 10:38:22 2009 -0700
Minor cleanup of breakpoint_thread_match (splittin one condition a bit)
* breakpoint.c (breakpoint_thread_match): Splitt a large condition
into several smaller conditions. No behavior change.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 7e50342..258a550 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1893,28 +1893,39 @@ 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 (overlay_debugging
- && section_is_overlay (bpt->section)
- && !section_is_mapped (bpt->section))
- continue; /* unmapped overlay -- can't be a match */
- else
- return 1;
- }
+ if (!breakpoint_enabled (bpt->owner)
+ && bpt->owner->enable_state != bp_permanent)
+ continue;
+
+ if (bpt->address != pc)
+ continue;
+
+ if (bpt->owner->thread != -1)
+ {
+ /* This is a thread-specific breakpoint. Check that ptid
+ matches that thread. If thread hasn't been computed yet,
+ it is now time to do so. */
+ if (thread == -1)
+ thread = pid_to_thread_id (ptid);
+ if (bpt->owner->thread != thread)
+ continue;
+ }
+
+ if (overlay_debugging
+ && section_is_overlay (bpt->section)
+ && !section_is_mapped (bpt->section))
+ continue; /* unmapped overlay -- can't be a match */
+
+ return 1;
}
return 0;