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 | f6485481002067afc158fe15f62739b050364a64 (patch) | |
| tree | 15ee6c04b59dc46e7d03e889e2657e9cce986afa /gdb/mi | |
| parent | 52d98df7420fa7442befa23cfee28187ed8077ee (diff) | |
| download | gdb-f6485481002067afc158fe15f62739b050364a64.zip gdb-f6485481002067afc158fe15f62739b050364a64.tar.gz gdb-f6485481002067afc158fe15f62739b050364a64.tar.bz2 | |
gdb: add interp::on_solib_loaded method
Same idea as previous patches, but for solib_loaded
Change-Id: I85edb0a4b377f4b2c39ffccf31cb75f38bae0f55
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-interp.c | 29 | ||||
| -rw-r--r-- | gdb/mi/mi-interp.h | 1 |
2 files changed, 10 insertions, 20 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 0bd7634..72bf2a8 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); @@ -845,30 +844,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 @@ -1083,7 +1073,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 edb5486..57bd296 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -59,6 +59,7 @@ public: 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; |