From patchwork Tue May 2 20:50:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 68666 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AD99638560B4 for ; Tue, 2 May 2023 20:55:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AD99638560B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683060943; bh=Oo5tul/uW+YGlwmLcGAyTwgkM2uhQkfzGxzAN9SEFaI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=VliwqnmqkKhPBoeLtzecnLvCVxV9V9jVFh3F2gaONhURiIKGXA8Vo+/O0SRrw0oiQ MmYk6ilWC+5CLpbYWw6pbZPixGt1Fqq6JguFl+R3R3mnxHHMnTZhDZ77PX0rg4IHBO 5mL2ZsAFOTBpX4ZfHMhb9N6jVqba61n+T+/Mzt1c= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id DD82E385770E for ; Tue, 2 May 2023 20:54:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD82E385770E 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 6FA5C1E12E; Tue, 2 May 2023 16:54:22 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 23/30] gdb: add interp::on_tsv_created method Date: Tue, 2 May 2023 16:50:03 -0400 Message-Id: <20230502205011.132151-24-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 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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 01fa44ceddcf..9d736fc4fcf2 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 3b8814616964..de1af0708b47 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 @@ class interp : public intrusive_list_node /* 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 832199d8cd97..509f84d82a13 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); @@ -512,27 +511,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. */ @@ -1043,7 +1032,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 af335df8344c..ee4807b93f4b 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -63,6 +63,7 @@ class mi_interp final : public interp 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 4e9967f5637a..0715b6eb696d 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 ee70f2bd4dee..46a027979e75 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 9517d144ccee..a32651cf5cc6 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"), @@ -3184,7 +3184,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; }