From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 627EA385840D for ; Tue, 2 May 2023 20:54:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 627EA385840D Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 12D271E11D; Tue, 2 May 2023 16:54:22 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 19/30] gdb: add interp::on_solib_loaded method Date: Tue, 2 May 2023 16:49:59 -0400 Message-Id: <20230502205011.132151-20-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com> References: <20230502205011.132151-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 /* 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