yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb: add interp::on_inferior_removed method

Browse Source 
Same idea as previous patches, but for inferior_removed.

Change-Id: I7971840bbbdcfabf77e2ded7584830c9dfdd10d0
This commit is contained in:
Simon Marchi 2023-05-02 11:35:36 -04:00
parent d38086cce9
commit 2646bfa763
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/inferior.c
View File

@ -260,6 +260,15 @@ inferior::clear_thread_list (bool silent)
ptid_thread_map.clear ();
}
/* Notify interpreters and observers that inferior INF was removed. */
static void
notify_inferior_removed (inferior *inf)
{
interps_notify_inferior_removed (inf);
gdb::observers::inferior_removed.notify (inf);
}
void
delete_inferior (struct inferior *inf)
{
@ -268,7 +277,7 @@ delete_inferior (struct inferior *inf)
auto it = inferior_list.iterator_to (*inf);
inferior_list.erase (it);
gdb::observers::inferior_removed.notify (inf);
notify_inferior_removed (inf);
/* Pop all targets now, this ensures that inferior::unpush is called
correctly. As pop_all_targets ends up making a temporary switch to

8
gdb/interps.c
View File

@ -486,6 +486,14 @@ interps_notify_inferior_disappeared (inferior *inf)
interps_notify (&interp::on_inferior_disappeared, inf);
}
/* See interps.h. */
void
interps_notify_inferior_removed (inferior *inf)
{
interps_notify (&interp::on_inferior_removed, inf);
}
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void

6
gdb/interps.h
View File

@ -131,6 +131,9 @@ public:
/* Notify the interpreter that inferior INF exited or was detached. */
virtual void on_inferior_disappeared (inferior *inf) {}
/* Notify the interpreter that inferior INF was removed. */
virtual void on_inferior_removed (inferior *inf) {}
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@ -257,6 +260,9 @@ extern void interps_notify_inferior_appeared (inferior *inf);
/* Notify all interpreters that inferior INF exited or was detached. */
extern void interps_notify_inferior_disappeared (inferior *inf);
/* Notify all interpreters that inferior INF was removed. */
extern void interps_notify_inferior_removed (inferior *inf);
/* well-known interpreters */
#define INTERP_CONSOLE "console"
#define INTERP_MI2 "mi2"

24
gdb/mi/mi-interp.c
View File

@ -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_removed (struct inferior *inf);
static void mi_on_resume (ptid_t ptid);
static void mi_solib_loaded (struct so_list *solib);
static void mi_solib_unloaded (struct so_list *solib);
@ -395,24 +394,14 @@ mi_interp::on_inferior_disappeared (inferior *inf)
gdb_flush (this->event_channel);
}
static void
mi_inferior_removed (struct inferior *inf)
void
mi_interp::on_inferior_removed (inferior *inf)
{
SWITCH_THRU_ALL_UIS ()
{
struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
target_terminal::scoped_restore_terminal_state term_state;
target_terminal::ours_for_output ();
if (mi == NULL)
continue;
target_terminal::scoped_restore_terminal_state term_state;
target_terminal::ours_for_output ();
gdb_printf (mi->event_channel,
"thread-group-removed,id=\"i%d\"",
inf->num);
gdb_flush (mi->event_channel);
}
gdb_printf (this->event_channel, "thread-group-removed,id=\"i%d\"", inf->num);
gdb_flush (this->event_channel);
}
/* Observers for several run control events that print why the
@ -1121,7 +1110,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
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");
gdb::observers::solib_loaded.attach (mi_solib_loaded, "mi-interp");

1
gdb/mi/mi-interp.h
View File

@ -55,6 +55,7 @@ public:
void on_inferior_added (inferior *inf) override;
void on_inferior_appeared (inferior *inf) override;
void on_inferior_disappeared (inferior *inf) override;
void on_inferior_removed (inferior *inf) override;
/* MI's output channels */
mi_console_file *out;