From bf506f275a7fff7f4bf10bc5b31f38d9c44a48e9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 21 Apr 2023 09:45:30 -0400 Subject: [PATCH] gdb: add interp::on_tsv_created method Same idea as previous patches, but for tsv_created. Change-Id: I9c30ecfdbd78ca015d613f43a0c0aef6c7eb32b5 --- gdb/interps.c | 8 ++++++++ gdb/interps.h | 7 +++++++ gdb/mi/mi-interp.c | 28 ++++++++-------------------- gdb/mi/mi-interp.h | 1 + gdb/observable.c | 1 - gdb/observable.h | 3 --- gdb/tracepoint.c | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 01fa44ceddc..9d736fc4fcf 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -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 diff --git a/gdb/interps.h b/gdb/interps.h index 3b881461696..de1af0708b4 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -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" diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index f78e6f959f1..f5a20534865 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_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 ()); - - 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 (); - gdb_printf (mi->event_channel, "tsv-created," - "name=\"%s\",initial=\"%s\"", - tsv->name.c_str (), plongest (tsv->initial_value)); + gdb_printf (this->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, diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index c5fded15254..169f107f405 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -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; diff --git a/gdb/observable.c b/gdb/observable.c index 4e9967f5637..0715b6eb696 100644 --- a/gdb/observable.c +++ b/gdb/observable.c @@ -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); diff --git a/gdb/observable.h b/gdb/observable.h index ee70f2bd4de..46a027979e7 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -190,9 +190,6 @@ extern observable<> gdb_datadir_changed; extern observable command_param_changed; -/* The new trace state variable TSV is created. */ -extern observable tsv_created; - /* The trace state variable TSV is deleted. If TSV is NULL, all trace state variables are deleted. */ extern observable tsv_deleted; diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index dffc80f7de3..3d925bf545c 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -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; } -- 2.30.2