From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 25/36] Convert static marker tracepoints to vtable ops
Date: Tue, 18 Jan 2022 12:39:56 -0700 [thread overview]
Message-ID: <20220118194007.2853108-26-tom@tromey.com> (raw)
In-Reply-To: <20220118194007.2853108-1-tom@tromey.com>
This converts static marker tracepoints to use vtable_breakpoint_ops.
---
gdb/breakpoint.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e1c6efafc25..98829b8f9f0 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -294,6 +294,14 @@ struct ranged_breakpoint : public ordinary_breakpoint
void print_recreate (struct ui_file *fp) override;
};
+/* Static tracepoints with marker (`-m'). */
+struct static_marker_tracepoint : public tracepoint
+{
+ std::vector<symtab_and_line> decode_location
+ (struct event_location *location,
+ struct program_space *search_pspace) override;
+};
+
/* The style in which to perform a dynamic printf. This is a user
option because different output options have different tradeoffs;
if GDB does the printing, there is better error handling if there
@@ -1209,11 +1217,14 @@ new_breakpoint_from_type (bptype type)
case bp_fast_tracepoint:
case bp_static_tracepoint:
- case bp_static_marker_tracepoint:
case bp_tracepoint:
b = new tracepoint ();
break;
+ case bp_static_marker_tracepoint:
+ b = new static_marker_tracepoint ();
+ break;
+
case bp_dprintf:
b = new dprintf_breakpoint ();
break;
@@ -12438,23 +12449,21 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch,
}
}
-static std::vector<symtab_and_line>
-strace_marker_decode_location (struct breakpoint *b,
- struct event_location *location,
- struct program_space *search_pspace)
+std::vector<symtab_and_line>
+static_marker_tracepoint::decode_location (struct event_location *location,
+ struct program_space *search_pspace)
{
- struct tracepoint *tp = (struct tracepoint *) b;
const char *s = get_linespec_location (location)->spec_string;
std::vector<symtab_and_line> sals = decode_static_tracepoint_spec (&s);
- if (sals.size () > tp->static_trace_marker_id_idx)
+ if (sals.size () > static_trace_marker_id_idx)
{
- sals[0] = sals[tp->static_trace_marker_id_idx];
+ sals[0] = sals[static_trace_marker_id_idx];
sals.resize (1);
return sals;
}
else
- error (_("marker %s not found"), tp->static_trace_marker_id.c_str ());
+ error (_("marker %s not found"), static_trace_marker_id.c_str ());
}
static struct breakpoint_ops strace_marker_breakpoint_ops;
@@ -14609,7 +14618,6 @@ initialize_breakpoint_ops (void)
*ops = vtable_breakpoint_ops;
ops->create_sals_from_location = strace_marker_create_sals_from_location;
ops->create_breakpoints_sal = strace_marker_create_breakpoints_sal;
- ops->decode_location = strace_marker_decode_location;
}
/* Chain containing all defined "enable breakpoint" subcommands. */
--
2.31.1
next prev parent reply other threads:[~2022-01-18 19:40 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 19:39 [PATCH 00/36] C++-ify breakpoints Tom Tromey
2022-01-18 19:39 ` [PATCH 01/36] Move "catch load" to a new file Tom Tromey
2022-04-23 2:34 ` Simon Marchi
2022-04-24 19:35 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 02/36] Boolify print_solib_event Tom Tromey
2022-01-18 19:39 ` [PATCH 03/36] Add an assertion to clone_momentary_breakpoint Tom Tromey
2022-04-25 13:25 ` Thiago Jung Bauermann
2022-04-25 19:03 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 04/36] Delete some unnecessary wrapper functions Tom Tromey
2022-04-25 14:08 ` Thiago Jung Bauermann
2022-04-25 19:06 ` Tom Tromey
2022-04-25 20:06 ` Thiago Jung Bauermann
2022-01-18 19:39 ` [PATCH 05/36] Return bool from breakpoint_ops::print_one Tom Tromey
2022-01-18 19:39 ` [PATCH 06/36] Add a vtable-based breakpoint ops Tom Tromey
2022-01-18 19:39 ` [PATCH 07/36] Convert break-catch-sig to use vtable ops Tom Tromey
2022-01-18 19:39 ` [PATCH 08/36] Convert break-catch-syscall to " Tom Tromey
2022-01-18 19:39 ` [PATCH 09/36] Convert break-catch-exec " Tom Tromey
2022-01-18 19:39 ` [PATCH 10/36] Convert break-catch-fork " Tom Tromey
2022-01-18 19:39 ` [PATCH 11/36] Convert break-catch-load " Tom Tromey
2022-01-18 19:39 ` [PATCH 12/36] Convert watchpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 13/36] Convert tracepoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 14/36] Add some new subclasses of breakpoint Tom Tromey
2022-01-18 19:39 ` [PATCH 15/36] Convert base breakpoints to vtable ops Tom Tromey
2022-05-02 10:27 ` Tom de Vries
2022-05-02 16:40 ` Tom Tromey
2022-01-18 19:39 ` [PATCH 16/36] Convert break-catch-throw " Tom Tromey
2022-01-18 19:39 ` [PATCH 17/36] Convert internal breakpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 18/36] Convert momentary " Tom Tromey
2022-01-18 19:39 ` [PATCH 19/36] Change inheritance of dprintf Tom Tromey
2022-01-18 19:39 ` [PATCH 20/36] Convert ordinary breakpoints to vtable ops Tom Tromey
2022-01-18 19:39 ` [PATCH 21/36] Convert Ada catchpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 22/36] Convert dprintf " Tom Tromey
2022-01-18 19:39 ` [PATCH 23/36] Convert ranged breakpoints " Tom Tromey
2022-01-18 19:39 ` [PATCH 24/36] Add bp_static_marker_tracepoint Tom Tromey
2022-01-18 19:39 ` Tom Tromey [this message]
2022-01-18 19:39 ` [PATCH 26/36] Remove bkpt_base_breakpoint_ops Tom Tromey
2022-01-18 19:39 ` [PATCH 27/36] Merge probe and ordinary breakpoints Tom Tromey
2022-01-18 19:39 ` [PATCH 28/36] Merge probe and ordinary tracepoints Tom Tromey
2022-01-18 19:40 ` [PATCH 29/36] Remove breakpoint_ops from init_ada_exception_breakpoint Tom Tromey
2022-01-18 19:40 ` [PATCH 30/36] Remove breakpoint_ops from init_catchpoint Tom Tromey
2022-01-18 19:40 ` [PATCH 31/36] Remove most fields from breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 32/36] Remove vtable_breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 33/36] Remove breakpoint ops initialization Tom Tromey
2022-01-18 19:40 ` [PATCH 34/36] Constify breakpoint_ops Tom Tromey
2022-01-18 19:40 ` [PATCH 35/36] Remove allocate_bp_location Tom Tromey
2022-01-18 19:40 ` [PATCH 36/36] Remove create_breakpoints_sal_default Tom Tromey
2022-04-22 20:21 ` [PATCH 00/36] C++-ify breakpoints Tom Tromey
2022-04-23 2:59 ` Simon Marchi
2022-04-29 22:15 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220118194007.2853108-26-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).