From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 4D1CC3857737 for ; Tue, 2 May 2023 20:56:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D1CC3857737 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 039581E114; Tue, 2 May 2023 16:56:23 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 25/30] gdb: add interp::on_tsv_modified method Date: Tue, 2 May 2023 16:50:05 -0400 Message-Id: <20230502205011.132151-26-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com> References: <20230502205011.132151-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Same idea as previous patches, but for tsv_modified. Change-Id: I55454a2386d5450040b3a353909b26f389a43682 --- gdb/interps.c | 8 ++++++++ gdb/interps.h | 6 ++++++ gdb/mi/mi-interp.c | 41 ++++++++++++++--------------------------- gdb/mi/mi-interp.h | 1 + gdb/observable.c | 1 - gdb/observable.h | 3 --- gdb/tracepoint.c | 2 +- 7 files changed, 30 insertions(+), 32 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index c8d4fbd0b4da..c727913e4806 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -551,6 +551,14 @@ interps_notify_tsv_deleted (const trace_state_variable *tsv) interps_notify (&interp::on_tsv_deleted, tsv); } +/* See interps.h. */ + +void +interps_notify_tsv_modified (const trace_state_variable *tsv) +{ + interps_notify (&interp::on_tsv_modified, tsv); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index 7e761375a05e..7bd57cb05ecc 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -163,6 +163,9 @@ class interp : public intrusive_list_node /* Notify the interpreter that trace state variable TSV was deleted. */ virtual void on_tsv_deleted (const trace_state_variable *tsv) {} + /* Notify the interpreter that trace state variable TSV was modified. */ + virtual void on_tsv_modified (const trace_state_variable *tsv) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -329,6 +332,9 @@ extern void interps_notify_tsv_created (const trace_state_variable *tsv); If TSV is nullptr, it means that all trace state variables were deleted. */ extern void interps_notify_tsv_deleted (const trace_state_variable *tsv); +/* Notify all interpreters that trace state variable TSV was modified. */ +extern void interps_notify_tsv_modified (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 c255630bd444..65b9bd3693a2 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_modified (const struct trace_state_variable *tsv); static void mi_breakpoint_created (struct breakpoint *b); static void mi_breakpoint_deleted (struct breakpoint *b); static void mi_breakpoint_modified (struct breakpoint *b); @@ -538,37 +537,26 @@ mi_interp::on_tsv_deleted (const trace_state_variable *tsv) gdb_flush (this->event_channel); } -/* Emit notification on modifying a trace state variable. */ - -static void -mi_tsv_modified (const struct trace_state_variable *tsv) +void +mi_interp::on_tsv_modified (const trace_state_variable *tsv) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = as_mi_interp (top_level_interpreter ()); - struct ui_out *mi_uiout; - - if (mi == NULL) - continue; - - mi_uiout = top_level_interpreter ()->interp_ui_out (); + ui_out *mi_uiout = this->interp_ui_out (); - 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-modified"); + gdb_printf (this->event_channel, + "tsv-modified"); - ui_out_redirect_pop redir (mi_uiout, mi->event_channel); + ui_out_redirect_pop redir (mi_uiout, this->event_channel); - mi_uiout->field_string ("name", tsv->name); - mi_uiout->field_string ("initial", - plongest (tsv->initial_value)); - if (tsv->value_known) - mi_uiout->field_string ("current", plongest (tsv->value)); + mi_uiout->field_string ("name", tsv->name); + mi_uiout->field_string ("initial", + plongest (tsv->initial_value)); + if (tsv->value_known) + mi_uiout->field_string ("current", plongest (tsv->value)); - gdb_flush (mi->event_channel); - } + gdb_flush (this->event_channel); } /* Print breakpoint BP on MI's event channel. */ @@ -1021,7 +1009,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::tsv_modified.attach (mi_tsv_modified, "mi-interp"); gdb::observers::breakpoint_created.attach (mi_breakpoint_created, "mi-interp"); gdb::observers::breakpoint_deleted.attach (mi_breakpoint_deleted, diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index edd5e9f1150c..11ec5ddf3781 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -65,6 +65,7 @@ class mi_interp final : public interp void on_traceframe_changed (int tfnum, int tpnum) override; void on_tsv_created (const trace_state_variable *tsv) override; void on_tsv_deleted (const trace_state_variable *tsv) override; + void on_tsv_modified (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 f70dcef3c450..3535e69f7f54 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_modified); DEFINE_OBSERVABLE (inferior_call_pre); DEFINE_OBSERVABLE (inferior_call_post); DEFINE_OBSERVABLE (register_changed); diff --git a/gdb/observable.h b/gdb/observable.h index 326c49ad37c0..1c7ba0a1ba67 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -190,9 +190,6 @@ extern observable<> gdb_datadir_changed; extern observable command_param_changed; -/* The trace state value TSV is modified. */ -extern observable tsv_modified; - /* An inferior function at ADDRESS is about to be called in thread THREAD. */ extern observable diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 08bc82a3d368..e6ef87475060 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -361,7 +361,7 @@ trace_variable_command (const char *args, int from_tty) if (tsv->initial_value != initval) { tsv->initial_value = initval; - gdb::observers::tsv_modified.notify (tsv); + interps_notify_tsv_modified (tsv); } gdb_printf (_("Trace state variable $%s " "now has initial value %s.\n"), -- 2.40.1