From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 19/30] gdb: add interp::on_solib_loaded method
Date: Tue, 2 May 2023 16:49:59 -0400 [thread overview]
Message-ID: <20230502205011.132151-20-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com>
Same idea as previous patches, but for solib_loaded
Change-Id: I85edb0a4b377f4b2c39ffccf31cb75f38bae0f55
---
gdb/interps.c | 8 ++++++++
gdb/interps.h | 7 +++++++
gdb/mi/mi-interp.c | 29 +++++++++--------------------
gdb/mi/mi-interp.h | 1 +
gdb/solib.c | 11 ++++++++++-
5 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/gdb/interps.c b/gdb/interps.c
index 17ea42499f95..6dde83b45e79 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -511,6 +511,14 @@ interps_notify_target_resumed (ptid_t ptid)
interps_notify (&interp::on_target_resumed, ptid);
}
+/* See interps.h. */
+
+void
+interps_notify_solib_loaded (so_list *so)
+{
+ interps_notify (&interp::on_solib_loaded, so);
+}
+
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void
diff --git a/gdb/interps.h b/gdb/interps.h
index 0434efe40b3c..7fce025aad69 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -31,6 +31,7 @@ struct ui;
class completion_tracker;
struct thread_info;
struct inferior;
+struct so_list;
typedef struct interp *(*interp_factory_func) (const char *name);
@@ -142,6 +143,9 @@ class interp : public intrusive_list_node<interp>
/* Notify the interpreter that the target was resumed. */
virtual void on_target_resumed (ptid_t ptid) {}
+ /* Notify the interpreter that solib SO has been loaded. */
+ virtual void on_solib_loaded (so_list *so) {}
+
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@@ -287,6 +291,9 @@ extern void interps_notify_record_changed (inferior *inf, int started,
/* Notify all interpreters that the target was resumed. */
extern void interps_notify_target_resumed (ptid_t ptid);
+/* Notify all interpreters that solib SO has been loaded. */
+extern void interps_notify_solib_loaded (so_list *so);
+
/* 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 5c944febf427..f0694cacfc86 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_solib_loaded (struct so_list *solib);
static void mi_solib_unloaded (struct so_list *solib);
static void mi_about_to_proceed (void);
static void mi_traceframe_changed (int tfnum, int tpnum);
@@ -844,30 +843,21 @@ mi_output_solib_attribs (ui_out *uiout, struct so_list *solib)
}
}
-static void
-mi_solib_loaded (struct so_list *solib)
+void
+mi_interp::on_solib_loaded (so_list *solib)
{
- SWITCH_THRU_ALL_UIS ()
- {
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
- struct ui_out *uiout;
+ ui_out *uiout = this->interp_ui_out ();
- if (mi == NULL)
- continue;
-
- uiout = top_level_interpreter ()->interp_ui_out ();
+ 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 (this->event_channel, "library-loaded");
- gdb_printf (mi->event_channel, "library-loaded");
+ ui_out_redirect_pop redir (uiout, this->event_channel);
- ui_out_redirect_pop redir (uiout, mi->event_channel);
+ mi_output_solib_attribs (uiout, solib);
- mi_output_solib_attribs (uiout, solib);
-
- gdb_flush (mi->event_channel);
- }
+ gdb_flush (this->event_channel);
}
static void
@@ -1082,7 +1072,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
- gdb::observers::solib_loaded.attach (mi_solib_loaded, "mi-interp");
gdb::observers::solib_unloaded.attach (mi_solib_unloaded, "mi-interp");
gdb::observers::about_to_proceed.attach (mi_about_to_proceed, "mi-interp");
gdb::observers::traceframe_changed.attach (mi_traceframe_changed,
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index fc0d8218ba73..62dee1cdfb5e 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -59,6 +59,7 @@ class mi_interp final : public interp
void on_record_changed (inferior *inf, int started, const char *method,
const char *format) override;
void on_target_resumed (ptid_t ptid) override;
+ void on_solib_loaded (so_list *so) override;
/* MI's output channels */
mi_console_file *out;
diff --git a/gdb/solib.c b/gdb/solib.c
index 16147830ef2c..fc23d284b8a0 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -760,6 +760,15 @@ solib_used (const struct so_list *const known)
return false;
}
+/* Notify interpreters and observers that solib SO has been loaded. */
+
+static void
+notify_solib_loaded (so_list *so)
+{
+ interps_notify_solib_loaded (so);
+ gdb::observers::solib_loaded.notify (so);
+}
+
/* See solib.h. */
void
@@ -920,7 +929,7 @@ update_solib_list (int from_tty)
/* Notify any observer that the shared object has been
loaded now that we've added it to GDB's tables. */
- gdb::observers::solib_loaded.notify (i);
+ notify_solib_loaded (i);
}
/* If a library was not found, issue an appropriate warning
--
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 ` [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 ` Simon Marchi [this message]
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-20-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).