diff options
author | Simon Marchi <simon.marchi@efficios.com> | 2023-04-21 09:45:30 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@efficios.com> | 2023-05-30 15:07:26 -0400 |
commit | d711fe3b0f31daefa09b5d45b647da1f688c0e96 (patch) | |
tree | b51aaed8db35b5b41dc462bea0f8c8e8b89caef6 /gdb/mi | |
parent | f6485481002067afc158fe15f62739b050364a64 (diff) | |
download | binutils-d711fe3b0f31daefa09b5d45b647da1f688c0e96.zip binutils-d711fe3b0f31daefa09b5d45b647da1f688c0e96.tar.gz binutils-d711fe3b0f31daefa09b5d45b647da1f688c0e96.tar.bz2 |
gdb: add interp::on_solib_unloaded method
Same idea as previous patches, but for solib_unloaded.
Change-Id: Iad847de93f0b38b5c90679a173d3beeaed7af6c5
Diffstat (limited to 'gdb/mi')
-rw-r--r-- | gdb/mi/mi-interp.c | 39 | ||||
-rw-r--r-- | gdb/mi/mi-interp.h | 1 |
2 files changed, 14 insertions, 26 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 72bf2a8..072002d 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 57bd296..704f2d9 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; |