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 ACA973858423 for ; Tue, 2 May 2023 20:54:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACA973858423 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 598EA1E128; Tue, 2 May 2023 16:54:22 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 22/30] gdb: add interp::on_traceframe_changed method Date: Tue, 2 May 2023 16:50:02 -0400 Message-Id: <20230502205011.132151-23-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 traceframe_changed. Change-Id: Ia473f07d70d57b30aca0094d0e0585d7e0d95637 --- gdb/interps.c | 8 ++++++++ gdb/interps.h | 10 ++++++++++ gdb/mi/mi-interp.c | 35 +++++++++++------------------------ gdb/mi/mi-interp.h | 1 + gdb/observable.c | 1 - gdb/observable.h | 6 ------ gdb/tracepoint.c | 3 ++- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 2c7fbc80b7df..01fa44ceddcf 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -527,6 +527,14 @@ interps_notify_solib_unloaded (so_list *so) interps_notify (&interp::on_solib_unloaded, so); } +/* See interps.h. */ + +void +interps_notify_traceframe_changed (int tfnum, int tpnum) +{ + interps_notify (&interp::on_traceframe_changed, tfnum, tpnum); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index a88c40581bb3..3b8814616964 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -153,6 +153,9 @@ class interp : public intrusive_list_node the inferior to proceed. */ virtual void on_about_to_proceed () {} + /* Notify the interpreter that the selected traceframe changed. */ + virtual void on_traceframe_changed (int tfnum, int tpnum) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -304,6 +307,13 @@ extern void interps_notify_solib_loaded (so_list *so); /* Notify all interpreters that solib SO has been unloaded. */ extern void interps_notify_solib_unloaded (so_list *so); +/* Notify all interpreters that the selected traceframe changed. + + The trace frame is changed to TFNUM (e.g., by using the 'tfind' command). + If TFNUM is negative, it means gdb resumed live debugging. The number of + the tracepoint associated with this traceframe is TPNUM. */ +extern void interps_notify_traceframe_changed (int tfnum, int tpnum); + /* 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 40a1fc93b48d..832199d8cd97 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_traceframe_changed (int tfnum, int tpnum); 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); @@ -494,33 +493,23 @@ struct mi_suppress_notification mi_suppress_notification = 0, }; -/* Emit notification on changing a traceframe. */ - -static void -mi_traceframe_changed (int tfnum, int tpnum) +void +mi_interp::on_traceframe_changed (int tfnum, int tpnum) { if (mi_suppress_notification.traceframe) return; - 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 (); - if (tfnum >= 0) - gdb_printf (mi->event_channel, "traceframe-changed," - "num=\"%d\",tracepoint=\"%d\"", - tfnum, tpnum); - else - gdb_printf (mi->event_channel, "traceframe-changed,end"); + if (tfnum >= 0) + gdb_printf (this->event_channel, "traceframe-changed," + "num=\"%d\",tracepoint=\"%d\"", + tfnum, tpnum); + else + gdb_printf (this->event_channel, "traceframe-changed,end"); - gdb_flush (mi->event_channel); - } + gdb_flush (this->event_channel); } /* Emit notification on creating a trace state variable. */ @@ -1054,8 +1043,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::traceframe_changed.attach (mi_traceframe_changed, - "mi-interp"); 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"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 2bb6840e786f..af335df8344c 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -62,6 +62,7 @@ class mi_interp final : public interp void on_solib_loaded (so_list *so) override; void on_solib_unloaded (so_list *so) override; void on_about_to_proceed () override; + void on_traceframe_changed (int tfnum, int tpnum) override; /* MI's output channels */ mi_console_file *out; diff --git a/gdb/observable.c b/gdb/observable.c index 5b78d48908b7..4e9967f5637a 100644 --- a/gdb/observable.c +++ b/gdb/observable.c @@ -51,7 +51,6 @@ DEFINE_OBSERVABLE (about_to_proceed); DEFINE_OBSERVABLE (breakpoint_created); DEFINE_OBSERVABLE (breakpoint_deleted); DEFINE_OBSERVABLE (breakpoint_modified); -DEFINE_OBSERVABLE (traceframe_changed); DEFINE_OBSERVABLE (architecture_changed); DEFINE_OBSERVABLE (thread_ptid_changed); DEFINE_OBSERVABLE (inferior_added); diff --git a/gdb/observable.h b/gdb/observable.h index be7c6ca8dd23..ee70f2bd4dee 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -140,12 +140,6 @@ extern observable breakpoint_deleted; is the modified breakpoint. */ extern observable breakpoint_modified; -/* The trace frame is changed to TFNUM (e.g., by using the 'tfind' - command). If TFNUM is negative, it means gdb resumes live - debugging. The number of the tracepoint associated with this - traceframe is TPNUM. */ -extern observable traceframe_changed; - /* The current architecture has changed. The argument NEWARCH is a pointer to the new architecture. */ extern observable architecture_changed; diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index ffda4a6439e4..9517d144ccee 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -59,6 +59,7 @@ #include "cli/cli-style.h" #include "expop.h" #include "gdbsupport/buildargv.h" +#include "interps.h" #include @@ -2139,7 +2140,7 @@ tfind_1 (enum trace_find_type type, int num, set_tracepoint_num (tp ? tp->number : target_tracept); if (target_frameno != get_traceframe_number ()) - gdb::observers::traceframe_changed.notify (target_frameno, tracepoint_number); + interps_notify_traceframe_changed (target_frameno, tracepoint_number); set_current_traceframe (target_frameno); -- 2.40.1