From d711fe3b0f31daefa09b5d45b647da1f688c0e96 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 21 Apr 2023 09:45:30 -0400 Subject: [PATCH] gdb: add interp::on_solib_unloaded method Same idea as previous patches, but for solib_unloaded. Change-Id: Iad847de93f0b38b5c90679a173d3beeaed7af6c5 --- gdb/interps.c | 8 ++++++++ gdb/interps.h | 6 ++++++ gdb/mi/mi-interp.c | 39 +++++++++++++-------------------------- gdb/mi/mi-interp.h | 1 + gdb/solib.c | 13 +++++++++++-- 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 6dde83b45e7..2c7fbc80b7d 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -519,6 +519,14 @@ interps_notify_solib_loaded (so_list *so) interps_notify (&interp::on_solib_loaded, so); } +/* See interps.h. */ + +void +interps_notify_solib_unloaded (so_list *so) +{ + interps_notify (&interp::on_solib_unloaded, so); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index 7fce025aad6..3339ae3d301 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -146,6 +146,9 @@ public: /* Notify the interpreter that solib SO has been loaded. */ virtual void on_solib_loaded (so_list *so) {} + /* Notify the interpreter that solib SO has been unloaded. */ + virtual void on_solib_unloaded (so_list *so) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -294,6 +297,9 @@ 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); +/* Notify all interpreters that solib SO has been unloaded. */ +extern void interps_notify_solib_unloaded (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 72bf2a82cdd..072002d4969 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_unloaded (struct so_list *solib); static void mi_about_to_proceed (void); static void mi_traceframe_changed (int tfnum, int tpnum); static void mi_tsv_created (const struct trace_state_variable *tsv); @@ -861,36 +860,25 @@ mi_interp::on_solib_loaded (so_list *solib) gdb_flush (this->event_channel); } -static void -mi_solib_unloaded (struct so_list *solib) +void +mi_interp::on_solib_unloaded (so_list *solib) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = as_mi_interp (top_level_interpreter ()); - struct ui_out *uiout; - - if (mi == NULL) - continue; - - uiout = top_level_interpreter ()->interp_ui_out (); + ui_out *uiout = this->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 (mi->event_channel, "library-unloaded"); + gdb_printf (this->event_channel, "library-unloaded"); - ui_out_redirect_pop redir (uiout, mi->event_channel); + ui_out_redirect_pop redir (uiout, this->event_channel); - uiout->field_string ("id", solib->so_original_name); - uiout->field_string ("target-name", solib->so_original_name); - uiout->field_string ("host-name", solib->so_name); - if (!gdbarch_has_global_solist (target_gdbarch ())) - { - uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num); - } + uiout->field_string ("id", solib->so_original_name); + uiout->field_string ("target-name", solib->so_original_name); + uiout->field_string ("host-name", solib->so_name); + if (!gdbarch_has_global_solist (target_gdbarch ())) + uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num); - gdb_flush (mi->event_channel); - } + gdb_flush (this->event_channel); } /* Emit notification about the command parameter change. */ @@ -1073,7 +1061,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - 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, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 57bd296f9e3..704f2d9bc83 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -60,6 +60,7 @@ public: const char *format) override; void on_target_resumed (ptid_t ptid) override; void on_solib_loaded (so_list *so) override; + void on_solib_unloaded (so_list *so) override; /* MI's output channels */ mi_console_file *out; diff --git a/gdb/solib.c b/gdb/solib.c index fc23d284b8a..701efa85d1a 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -769,6 +769,15 @@ notify_solib_loaded (so_list *so) gdb::observers::solib_loaded.notify (so); } +/* Notify interpreters and observers that solib SO has been unloaded. */ + +static void +notify_solib_unloaded (so_list *so) +{ + interps_notify_solib_unloaded (so); + gdb::observers::solib_unloaded.notify (so); +} + /* See solib.h. */ void @@ -869,7 +878,7 @@ update_solib_list (int from_tty) { /* Notify any observer that the shared object has been unloaded before we remove it from GDB's tables. */ - gdb::observers::solib_unloaded.notify (gdb); + notify_solib_unloaded (gdb); current_program_space->deleted_solibs.push_back (gdb->so_name); @@ -1237,7 +1246,7 @@ clear_solib (void) struct so_list *so = current_program_space->so_list; current_program_space->so_list = so->next; - gdb::observers::solib_unloaded.notify (so); + notify_solib_unloaded (so); current_program_space->remove_target_sections (so); free_so (so); } -- 2.30.2