gdb: add interp::on_tsv_created method

Same idea as previous patches, but for tsv_created.

Change-Id: I9c30ecfdbd78ca015d613f43a0c0aef6c7eb32b5
This commit is contained in:
Simon Marchi
2023-04-21 09:45:30 -04:00
parent 0bc845fc98
commit bf506f275a
7 changed files with 26 additions and 26 deletions

View File

@@ -535,6 +535,14 @@ interps_notify_traceframe_changed (int tfnum, int tpnum)
interps_notify (&interp::on_traceframe_changed, tfnum, tpnum);
}
/* See interps.h. */
void
interps_notify_tsv_created (const trace_state_variable *tsv)
{
interps_notify (&interp::on_tsv_created, tsv);
}
/* This just adds the "interpreter-exec" command. */
void _initialize_interpreter ();
void

View File

@@ -32,6 +32,7 @@ class completion_tracker;
struct thread_info;
struct inferior;
struct so_list;
struct trace_state_variable;
typedef struct interp *(*interp_factory_func) (const char *name);
@@ -156,6 +157,9 @@ public:
/* Notify the interpreter that the selected traceframe changed. */
virtual void on_traceframe_changed (int tfnum, int tpnum) {}
/* Notify the interpreter that trace state variable TSV was created. */
virtual void on_tsv_created (const trace_state_variable *tsv) {}
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
@@ -314,6 +318,9 @@ extern void interps_notify_solib_unloaded (so_list *so);
the tracepoint associated with this traceframe is TPNUM. */
extern void interps_notify_traceframe_changed (int tfnum, int tpnum);
/* Notify all interpreters that trace state variable TSV was created. */
extern void interps_notify_tsv_created (const trace_state_variable *tsv);
/* well-known interpreters */
#define INTERP_CONSOLE "console"
#define INTERP_MI2 "mi2"

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_tsv_created (const struct trace_state_variable *tsv);
static void mi_tsv_deleted (const struct trace_state_variable *tsv);
static void mi_tsv_modified (const struct trace_state_variable *tsv);
static void mi_breakpoint_created (struct breakpoint *b);
@@ -513,27 +512,17 @@ mi_interp::on_traceframe_changed (int tfnum, int tpnum)
gdb_flush (this->event_channel);
}
/* Emit notification on creating a trace state variable. */
static void
mi_tsv_created (const struct trace_state_variable *tsv)
void
mi_interp::on_tsv_created (const trace_state_variable *tsv)
{
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;
gdb_printf (this->event_channel, "tsv-created,"
"name=\"%s\",initial=\"%s\"",
tsv->name.c_str (), plongest (tsv->initial_value));
target_terminal::scoped_restore_terminal_state term_state;
target_terminal::ours_for_output ();
gdb_printf (mi->event_channel, "tsv-created,"
"name=\"%s\",initial=\"%s\"",
tsv->name.c_str (), plongest (tsv->initial_value));
gdb_flush (mi->event_channel);
}
gdb_flush (this->event_channel);
}
/* Emit notification on deleting a trace state variable. */
@@ -1044,7 +1033,6 @@ _initialize_mi_interp ()
interp_factory_register (INTERP_MI4, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
gdb::observers::tsv_created.attach (mi_tsv_created, "mi-interp");
gdb::observers::tsv_deleted.attach (mi_tsv_deleted, "mi-interp");
gdb::observers::tsv_modified.attach (mi_tsv_modified, "mi-interp");
gdb::observers::breakpoint_created.attach (mi_breakpoint_created,

View File

@@ -63,6 +63,7 @@ public:
void on_solib_unloaded (so_list *so) override;
void on_about_to_proceed () override;
void on_traceframe_changed (int tfnum, int tpnum) override;
void on_tsv_created (const trace_state_variable *tsv) override;
/* MI's output channels */
mi_console_file *out;

View File

@@ -62,7 +62,6 @@ DEFINE_OBSERVABLE (memory_changed);
DEFINE_OBSERVABLE (before_prompt);
DEFINE_OBSERVABLE (gdb_datadir_changed);
DEFINE_OBSERVABLE (command_param_changed);
DEFINE_OBSERVABLE (tsv_created);
DEFINE_OBSERVABLE (tsv_deleted);
DEFINE_OBSERVABLE (tsv_modified);
DEFINE_OBSERVABLE (inferior_call_pre);

View File

@@ -190,9 +190,6 @@ extern observable<> gdb_datadir_changed;
extern observable<const char */* param */, const char */* value */>
command_param_changed;
/* The new trace state variable TSV is created. */
extern observable<const struct trace_state_variable */* tsv */> tsv_created;
/* The trace state variable TSV is deleted. If TSV is NULL, all
trace state variables are deleted. */
extern observable<const struct trace_state_variable */* tsv */> tsv_deleted;

View File

@@ -373,7 +373,7 @@ trace_variable_command (const char *args, int from_tty)
tsv = create_trace_state_variable (name.c_str ());
tsv->initial_value = initval;
gdb::observers::tsv_created.notify (tsv);
interps_notify_tsv_created (tsv);
gdb_printf (_("Trace state variable $%s "
"created, with initial value %s.\n"),
@@ -3180,7 +3180,7 @@ create_tsv_from_upload (struct uploaded_tsv *utsv)
tsv->initial_value = utsv->initial_value;
tsv->builtin = utsv->builtin;
gdb::observers::tsv_created.notify (tsv);
interps_notify_tsv_created (tsv);
return tsv;
}