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 | d38086cce9ab3d1c0acd48dd89fe5721caa08fed (patch) | |
| tree | 17d38679684ce21c9750a38ff5e4fcc0cb93f0b5 /gdb/mi | |
| parent | 0c613e170e60f673cd47b23a7052b19b128469c5 (diff) | |
| download | gdb-d38086cce9ab3d1c0acd48dd89fe5721caa08fed.zip gdb-d38086cce9ab3d1c0acd48dd89fe5721caa08fed.tar.gz gdb-d38086cce9ab3d1c0acd48dd89fe5721caa08fed.tar.bz2 | |
gdb: add interp::on_inferior_disappeared method
Same idea as previous patches, but for inferior_disappeared.
For symmetry with on_inferior_appeared, I named this one
on_inferior_disappeared, despite the observer being called
inferior_exit. This is called when detaching an inferior, so I think
that calling it "disappeared" is a bit less misleading (the observer
should probably be renamed later).
Change-Id: I372101586bc9454997953c1e540a2a6685f53ef6
Diffstat (limited to 'gdb/mi')
| -rw-r--r-- | gdb/mi/mi-interp.c | 34 | ||||
| -rw-r--r-- | gdb/mi/mi-interp.h | 1 |
2 files changed, 13 insertions, 22 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 3fce9b6..ad934d3 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -62,7 +62,6 @@ static void mi_remove_notify_hooks (void); static void mi_record_changed (struct inferior*, int, const char *, const char *); -static void mi_inferior_exit (struct inferior *inf); static void mi_inferior_removed (struct inferior *inf); static void mi_on_resume (ptid_t ptid); static void mi_solib_loaded (struct so_list *solib); @@ -379,29 +378,21 @@ mi_interp::on_inferior_appeared (inferior *inf) gdb_flush (this->event_channel); } -static void -mi_inferior_exit (struct inferior *inf) +void +mi_interp::on_inferior_disappeared (inferior *inf) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = as_mi_interp (top_level_interpreter ()); - - if (mi == NULL) - continue; - - 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 (); - if (inf->has_exit_code) - gdb_printf (mi->event_channel, - "thread-group-exited,id=\"i%d\",exit-code=\"%s\"", - inf->num, int_string (inf->exit_code, 8, 0, 0, 1)); - else - gdb_printf (mi->event_channel, - "thread-group-exited,id=\"i%d\"", inf->num); + if (inf->has_exit_code) + gdb_printf (this->event_channel, + "thread-group-exited,id=\"i%d\",exit-code=\"%s\"", + inf->num, int_string (inf->exit_code, 8, 0, 0, 1)); + else + gdb_printf (this->event_channel, + "thread-group-exited,id=\"i%d\"", inf->num); - gdb_flush (mi->event_channel); - } + gdb_flush (this->event_channel); } static void @@ -1130,7 +1121,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::inferior_exit.attach (mi_inferior_exit, "mi-interp"); gdb::observers::inferior_removed.attach (mi_inferior_removed, "mi-interp"); gdb::observers::record_changed.attach (mi_record_changed, "mi-interp"); gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index f57f99b..66c5585 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -54,6 +54,7 @@ public: void on_thread_exited (thread_info *t, int silent) override; void on_inferior_added (inferior *inf) override; void on_inferior_appeared (inferior *inf) override; + void on_inferior_disappeared (inferior *inf) override; /* MI's output channels */ mi_console_file *out; |