diff options
| author | Sergio Durigan Junior <sergiodj@redhat.com> | 2014-10-14 14:45:13 -0400 |
|---|---|---|
| committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2014-10-14 14:46:18 -0400 |
| commit | 0ea5cda8612bd2233f7a2f9d1eba0b62c2e6c015 (patch) | |
| tree | 68a032cab73c270e981d6efe1d1ec726fee51b11 /gdb/breakpoint.c | |
| parent | f7088df3b1c0370101edada54e26d24efb53125c (diff) | |
| download | gdb-0ea5cda8612bd2233f7a2f9d1eba0b62c2e6c015.zip gdb-0ea5cda8612bd2233f7a2f9d1eba0b62c2e6c015.tar.gz gdb-0ea5cda8612bd2233f7a2f9d1eba0b62c2e6c015.tar.bz2 | |
Only call {set,clear}_semaphore probe function if they are not NULL
This patch is a response to what I commented on:
<https://sourceware.org/ml/gdb-patches/2014-10/msg00046.html>
When reviewing Jose's USDT probe support patches. Basically, in his
patch he had to create dummy functions for the set_semaphore and the
clear_semaphore methods of probe_ops (gdb/probe.h), because those
functions were called inconditionally from inside gdb/breakpoint.c and
gdb/tracepoint.c. However, the semaphore concept may not apply to all
types of probes, and this is the case here: USDT probes do not have
semaphores (although SDT probes do).
Anyway, this is a simple (almost obvious) patch to guard the call to
{set,clear}_semaphore. It does not introduce any regression on a
Fedora 20 x86_64.
I will apply it in a few days in case there is no comment.
gdb/ChangeLog:
2014-10-14 Sergio Durigan Junior <sergiodj@redhat.com>
* breakpoint.c (bkpt_probe_insert_location): Call set_semaphore
only if it is not NULL.
(bkpt_probe_remove_location): Likewise, for clear_semaphore.
* probe.h (struct probe_ops) <set_semaphore>: Update comment.
(struct probe_ops) <clear_semaphore>: Likewise.
* tracepoint.c (start_tracing): Call set_semaphore only if it is
not NULL.
(stop_tracing): Likewise, for clear_semaphore.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index a144a7e..dc2e297 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -13696,9 +13696,10 @@ bkpt_probe_insert_location (struct bp_location *bl) { /* The insertion was successful, now let's set the probe's semaphore if needed. */ - bl->probe.probe->pops->set_semaphore (bl->probe.probe, - bl->probe.objfile, - bl->gdbarch); + if (bl->probe.probe->pops->set_semaphore != NULL) + bl->probe.probe->pops->set_semaphore (bl->probe.probe, + bl->probe.objfile, + bl->gdbarch); } return v; @@ -13708,9 +13709,10 @@ static int bkpt_probe_remove_location (struct bp_location *bl) { /* Let's clear the semaphore before removing the location. */ - bl->probe.probe->pops->clear_semaphore (bl->probe.probe, - bl->probe.objfile, - bl->gdbarch); + if (bl->probe.probe->pops->clear_semaphore != NULL) + bl->probe.probe->pops->clear_semaphore (bl->probe.probe, + bl->probe.objfile, + bl->gdbarch); return bkpt_remove_location (bl); } |