From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 16/30] gdb: add interp::on_inferior_removed method
Date: Tue, 2 May 2023 16:49:56 -0400 [thread overview]
Message-ID: <20230502205011.132151-17-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com>
Same idea as previous patches, but for inferior_removed.
Change-Id: I7971840bbbdcfabf77e2ded7584830c9dfdd10d0
---
gdb/inferior.c | 11 ++++++++++-
gdb/interps.c | 8 ++++++++
gdb/interps.h | 6 ++++++
gdb/mi/mi-interp.c | 24 ++++++------------------
gdb/mi/mi-interp.h | 1 +
5 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 32fe9ccbd659..eee4785fbf76 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -260,6 +260,15 @@ inferior::clear_thread_list (bool silent)
ptid_thread_map.clear ();
}
+/* Notify interpreters and observers that inferior INF was removed. */
+
+static void
+notify_inferior_removed (inferior *inf)
+{
+ interps_notify_inferior_removed (inf);
+ gdb::observers::inferior_removed.notify (inf);
+}
+
void
delete_inferior (struct inferior *inf)
{
@@ -268,7 +277,7 @@ delete_inferior (struct inferior *inf)
auto it = inferior_list.iterator_to (*inf);
inferior_list.erase (it);
- gdb::observers::inferior_removed.notify (inf);
+ notify_inferior_removed (inf);
/* Pop all targets now, this ensures that inferior::unpush is called
correctly. As pop_all_targets ends up making a temporary switch to
diff --git a/gdb/interps.c b/gdb/interps.c
index 46b0ecbd73fa..1bcc33c2a8c1 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -486,6 +486,14 @@ interps_notify_inferior_disappeared (inferior *inf)
interps_notify (&interp::on_inferior_disappeared, inf);
}
+/* See interps.h. */
+
+void
+interps_notify_inferior_removed (inferior *inf)
+{
+ interps_notify (&interp::on_inferior_removed, inf);
+}
+
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void
diff --git a/gdb/interps.h b/gdb/interps.h
index b1aee5db8290..ad351bbf807f 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -131,6 +131,9 @@ class interp : public intrusive_list_node<interp>
/* Notify the interpreter that inferior INF exited or was detached. */
virtual void on_inferior_disappeared (inferior *inf) {}
+ /* Notify the interpreter that inferior INF was removed. */
+ virtual void on_inferior_removed (inferior *inf) {}
+
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@@ -257,6 +260,9 @@ extern void interps_notify_inferior_appeared (inferior *inf);
/* Notify all interpreters that inferior INF exited or was detached. */
extern void interps_notify_inferior_disappeared (inferior *inf);
+/* Notify all interpreters that inferior INF was removed. */
+extern void interps_notify_inferior_removed (inferior *inf);
+
/* 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 f6ce077d8b9e..e2e7eb56fb57 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -62,7 +62,6 @@ static void mi_remove_notify_hooks (void);
static void mi_record_changed (struct inferior*, int, const char *,
const char *);
-static void mi_inferior_removed (struct inferior *inf);
static void mi_on_resume (ptid_t ptid);
static void mi_solib_loaded (struct so_list *solib);
static void mi_solib_unloaded (struct so_list *solib);
@@ -394,24 +393,14 @@ mi_interp::on_inferior_disappeared (inferior *inf)
gdb_flush (this->event_channel);
}
-static void
-mi_inferior_removed (struct inferior *inf)
+void
+mi_interp::on_inferior_removed (inferior *inf)
{
- 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 ();
+ target_terminal::scoped_restore_terminal_state term_state;
+ target_terminal::ours_for_output ();
- gdb_printf (mi->event_channel,
- "thread-group-removed,id=\"i%d\"",
- inf->num);
- gdb_flush (mi->event_channel);
- }
+ gdb_printf (this->event_channel, "thread-group-removed,id=\"i%d\"", inf->num);
+ gdb_flush (this->event_channel);
}
/* Observers for several run control events that print why the
@@ -1120,7 +1109,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
- gdb::observers::inferior_removed.attach (mi_inferior_removed, "mi-interp");
gdb::observers::record_changed.attach (mi_record_changed, "mi-interp");
gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp");
gdb::observers::solib_loaded.attach (mi_solib_loaded, "mi-interp");
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 5db17a6d2684..a970c3d0db98 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -55,6 +55,7 @@ class mi_interp final : public interp
void on_inferior_added (inferior *inf) override;
void on_inferior_appeared (inferior *inf) override;
void on_inferior_disappeared (inferior *inf) override;
+ void on_inferior_removed (inferior *inf) override;
/* MI's output channels */
mi_console_file *out;
--
2.40.1
next prev parent reply other threads:[~2023-05-02 20:54 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 ` Simon Marchi [this message]
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 ` [PATCH 27/30] gdb: add interp::on_breakpoint_deleted method Simon Marchi
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-17-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).