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

gdb: add interp::on_target_resumed method

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

Change-Id: I66fa28d1d41a1f3c4fb0d6a470137d493eac3c8c
This commit is contained in:
Simon Marchi 2023-04-21 09:45:30 -04:00
parent 44fbffc69d
commit 52d98df742
5 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/interps.c
View File

@ -503,6 +503,14 @@ interps_notify_record_changed (inferior *inf, int started, const char *method,
interps_notify (&interp::on_record_changed, inf, started, method, format);
}
/* See interps.h. */
void
interps_notify_target_resumed (ptid_t ptid)
{
interps_notify (&interp::on_target_resumed, ptid);
}
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void

6
gdb/interps.h
View File

@ -139,6 +139,9 @@ public:
virtual void on_record_changed (inferior *inf, int started,
const char *method, const char *format) {}
/* Notify the interpreter that the target was resumed. */
virtual void on_target_resumed (ptid_t ptid) {}
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@ -281,6 +284,9 @@ extern void interps_notify_record_changed (inferior *inf, int started,
const char *method,
const char *format);
/* Notify all interpreters that the target was resumed. */
extern void interps_notify_target_resumed (ptid_t ptid);
/* well-known interpreters */
#define INTERP_CONSOLE "console"
#define INTERP_MI2 "mi2"

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

@ -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_on_resume (ptid_t ptid);
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);
@ -802,8 +801,8 @@ mi_on_resume_1 (struct mi_interp *mi,
gdb_flush (mi->raw_stdout);
}
static void
mi_on_resume (ptid_t ptid)
void
mi_interp::on_target_resumed (ptid_t ptid)
{
struct thread_info *tp = NULL;
@ -817,18 +816,10 @@ mi_on_resume (ptid_t ptid)
if (tp->control.in_infcall)
return;
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 ();
mi_on_resume_1 (mi, target, ptid);
}
mi_on_resume_1 (this, target, ptid);
}
/* See mi-interp.h. */
@ -1092,7 +1083,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp");
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");

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

@ -58,6 +58,7 @@ public:
void on_inferior_removed (inferior *inf) override;
void on_record_changed (inferior *inf, int started, const char *method,
const char *format) override;
void on_target_resumed (ptid_t ptid) override;
/* MI's output channels */
mi_console_file *out;

15
gdb/thread.c
View File

@ -845,13 +845,22 @@ set_running_thread (struct thread_info *tp, bool running)
return started;
}
/* Notify interpreters and observers that the target was resumed. */
static void
notify_target_resumed (ptid_t ptid)
{
interps_notify_target_resumed (ptid);
gdb::observers::target_resumed.notify (ptid);
}
/* See gdbthread.h. */
void
thread_info::set_running (bool running)
{
if (set_running_thread (this, running))
gdb::observers::target_resumed.notify (this->ptid);
notify_target_resumed (this->ptid);
}
void
@ -868,7 +877,7 @@ set_running (process_stratum_target *targ, ptid_t ptid, bool running)
any_started = true;
if (any_started)
gdb::observers::target_resumed.notify (ptid);
notify_target_resumed (ptid);
}
void
@ -916,7 +925,7 @@ finish_thread_state (process_stratum_target *targ, ptid_t ptid)
any_started = true;
if (any_started)
gdb::observers::target_resumed.notify (ptid);
notify_target_resumed (ptid);
}
/* See gdbthread.h. */