From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 27/30] gdb: add interp::on_breakpoint_deleted method
Date: Tue, 2 May 2023 16:50:07 -0400 [thread overview]
Message-ID: <20230502205011.132151-28-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com>
Same idea as previous patches, but for breakpoint_deleted.
Change-Id: I59c231ce963491bb1eee1432ee1090138f09e19c
---
gdb/breakpoint.c | 11 ++++++++++-
gdb/interps.c | 8 ++++++++
gdb/interps.h | 6 ++++++
gdb/mi/mi-interp.c | 27 ++++++---------------------
gdb/mi/mi-interp.h | 1 +
5 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a600bc7cc7fc..430e3b959ddf 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -12329,6 +12329,15 @@ strace_marker_p (struct breakpoint *b)
return b->type == bp_static_marker_tracepoint;
}
+/* Notify interpreters and observers that breakpoint B was deleted. */
+
+static void
+notify_breakpoint_deleted (breakpoint *b)
+{
+ interps_notify_breakpoint_deleted (b);
+ gdb::observers::breakpoint_deleted.notify (b);
+}
+
/* Delete a breakpoint and clean up all traces of it in the data
structures. */
@@ -12384,7 +12393,7 @@ delete_breakpoint (struct breakpoint *bpt)
a problem in that process, we'll be asked to delete the half-created
watchpoint. In that case, don't announce the deletion. */
if (bpt->number)
- gdb::observers::breakpoint_deleted.notify (bpt);
+ notify_breakpoint_deleted (bpt);
if (breakpoint_chain == bpt)
breakpoint_chain = bpt->next;
diff --git a/gdb/interps.c b/gdb/interps.c
index f8f97513ac66..dc36af64f4c4 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -567,6 +567,14 @@ interps_notify_breakpoint_created (breakpoint *b)
interps_notify (&interp::on_breakpoint_created, b);
}
+/* See interps.h. */
+
+void
+interps_notify_breakpoint_deleted (breakpoint *b)
+{
+ interps_notify (&interp::on_breakpoint_deleted, b);
+}
+
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void
diff --git a/gdb/interps.h b/gdb/interps.h
index b1e2903e1571..0e17b14735c0 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -169,6 +169,9 @@ class interp : public intrusive_list_node<interp>
/* Notify the interpreter that breakpoint B was created. */
virtual void on_breakpoint_created (breakpoint *b) {}
+ /* Notify the interpreter that breakpoint B was deleted. */
+ virtual void on_breakpoint_deleted (breakpoint *b) {}
+
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@@ -341,6 +344,9 @@ extern void interps_notify_tsv_modified (const trace_state_variable *tsv);
/* Notify all interpreters that breakpoint B was created. */
extern void interps_notify_breakpoint_created (breakpoint *b);
+/* Notify all interpreters that breakpoint B was deleted. */
+extern void interps_notify_breakpoint_deleted (breakpoint *b);
+
/* well-known interpreters */
#define INTERP_CONSOLE "console"
#define INTERP_MI2 "mi2"
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index d7df572546c4..334d7f9c5a82 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -60,7 +60,6 @@ static int mi_interp_query_hook (const char *ctlstr, va_list ap)
static void mi_insert_notify_hooks (void);
static void mi_remove_notify_hooks (void);
-static void mi_breakpoint_deleted (struct breakpoint *b);
static void mi_breakpoint_modified (struct breakpoint *b);
static void mi_command_param_changed (const char *param, const char *value);
static void mi_memory_changed (struct inferior *inf, CORE_ADDR memaddr,
@@ -605,10 +604,8 @@ mi_interp::on_breakpoint_created (breakpoint *b)
gdb_flush (this->event_channel);
}
-/* Emit notification about deleted breakpoint. */
-
-static void
-mi_breakpoint_deleted (struct breakpoint *b)
+void
+mi_interp::on_breakpoint_deleted (breakpoint *b)
{
if (mi_suppress_notification.breakpoint)
return;
@@ -616,21 +613,11 @@ mi_breakpoint_deleted (struct breakpoint *b)
if (b->number <= 0)
return;
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- continue;
-
- target_terminal::scoped_restore_terminal_state term_state;
- target_terminal::ours_for_output ();
-
- gdb_printf (mi->event_channel, "breakpoint-deleted,id=\"%d\"",
- b->number);
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "breakpoint-deleted,id=\"%d\"", b->number);
+ gdb_flush (this->event_channel);
}
/* Emit notification about modified breakpoint. */
@@ -997,8 +984,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
- gdb::observers::breakpoint_deleted.attach (mi_breakpoint_deleted,
- "mi-interp");
gdb::observers::breakpoint_modified.attach (mi_breakpoint_modified,
"mi-interp");
gdb::observers::command_param_changed.attach (mi_command_param_changed,
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index bbd47422e962..61b8739b9b3c 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -67,6 +67,7 @@ class mi_interp final : public interp
void on_tsv_deleted (const trace_state_variable *tsv) override;
void on_tsv_modified (const trace_state_variable *tsv) override;
void on_breakpoint_created (breakpoint *b) override;
+ void on_breakpoint_deleted (breakpoint *b) override;
/* MI's output channels */
mi_console_file *out;
--
2.40.1
next prev parent reply other threads:[~2023-05-02 20:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 20:49 [PATCH 00/30] Switch interpreters to use virtual methods Simon Marchi
2023-05-02 20:49 ` [PATCH 01/30] gdb/mi: fix ^running record with multiple MI interpreters Simon Marchi
2023-05-03 14:42 ` Alexandra Petlanova Hajkova
2023-05-03 15:02 ` Simon Marchi
2023-05-29 14:53 ` Simon Marchi
2023-05-02 20:49 ` [PATCH 02/30] gdb/mi: make current_token a field of mi_interp Simon Marchi
2023-05-04 12:31 ` Alexandra Petlanova Hajkova
2023-05-02 20:49 ` [PATCH 03/30] gdb: add interp::on_signal_received method Simon Marchi
2023-05-04 14:38 ` Alexandra Petlanova Hajkova
2023-05-02 20:49 ` [PATCH 04/30] gdb: add interp::on_normal_stop method Simon Marchi
2023-05-02 20:49 ` [PATCH 05/30] gdb: add interp::on_signal_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 06/30] gdb: add interp::on_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 07/30] gdb: add interp::on_no_history method Simon Marchi
2023-05-02 20:49 ` [PATCH 08/30] gdb: add interp::on_sync_execution_done method Simon Marchi
2023-05-02 20:49 ` [PATCH 09/30] gdb: add interp::on_command_error method Simon Marchi
2023-05-02 20:49 ` [PATCH 10/30] gdb: add interp::on_user_selected_context_changed method Simon Marchi
2023-05-02 20:49 ` [PATCH 11/30] gdb: add interp::on_new_thread method Simon Marchi
2023-05-02 20:49 ` [PATCH 12/30] gdb: add interp::on_thread_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 13/30] gdb: add interp::on_inferior_added method Simon Marchi
2023-05-02 20:49 ` [PATCH 14/30] gdb: add interp::on_inferior_appeared method Simon Marchi
2023-05-02 20:49 ` [PATCH 15/30] gdb: add interp::on_inferior_disappeared method Simon Marchi
2023-05-02 20:49 ` [PATCH 16/30] gdb: add interp::on_inferior_removed method Simon Marchi
2023-05-02 20:49 ` [PATCH 17/30] gdb: add interp::on_record_changed method Simon Marchi
2023-05-02 20:49 ` [PATCH 18/30] gdb: add interp::on_target_resumed method Simon Marchi
2023-05-02 20:49 ` [PATCH 19/30] gdb: add interp::on_solib_loaded method Simon Marchi
2023-05-02 20:50 ` [PATCH 20/30] gdb: add interp::on_solib_unloaded method Simon Marchi
2023-05-02 20:50 ` [PATCH 21/30] gdb: add interp::on_about_to_proceed method Simon Marchi
2023-05-02 20:50 ` [PATCH 22/30] gdb: add interp::on_traceframe_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 23/30] gdb: add interp::on_tsv_created method Simon Marchi
2023-05-02 20:50 ` [PATCH 24/30] gdb: add interp::on_tsv_deleted method Simon Marchi
2023-05-02 20:50 ` [PATCH 25/30] gdb: add interp::on_tsv_modified method Simon Marchi
2023-05-02 20:50 ` [PATCH 26/30] gdb: add interp::on_breakpoint_created method Simon Marchi
2023-05-02 20:50 ` Simon Marchi [this message]
2023-05-02 20:50 ` [PATCH 28/30] gdb: add interp::on_breakpoint_modified method Simon Marchi
2023-05-02 20:50 ` [PATCH 29/30] gdb: add interp::on_param_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 30/30] gdb: add interp::on_memory_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 00/30] Make interpreters use virtual methods (instead of observers) Simon Marchi
2023-05-23 12:43 ` [PATCH 00/30] Switch interpreters to use virtual methods Simon Marchi
2023-05-30 19:09 ` Simon Marchi
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=20230502205011.132151-28-simon.marchi@efficios.com \
--to=simon.marchi@efficios.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).