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 469ED3858433 for ; Tue, 2 May 2023 20:54:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 469ED3858433 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 F10FB1E11B; Tue, 2 May 2023 16:54:21 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 18/30] gdb: add interp::on_target_resumed method Date: Tue, 2 May 2023 16:49:58 -0400 Message-Id: <20230502205011.132151-19-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 target_resumed. Change-Id: I66fa28d1d41a1f3c4fb0d6a470137d493eac3c8c --- gdb/interps.c | 8 ++++++++ gdb/interps.h | 6 ++++++ gdb/mi/mi-interp.c | 20 +++++--------------- gdb/mi/mi-interp.h | 1 + gdb/thread.c | 15 ++++++++++++--- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 986c5b755f84..17ea42499f95 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -503,6 +503,14 @@ interps_notify_record_changed (inferior *inf, int started, const char *method, interps_notify (&interp::on_record_changed, inf, started, method, format); } +/* See interps.h. */ + +void +interps_notify_target_resumed (ptid_t ptid) +{ + interps_notify (&interp::on_target_resumed, ptid); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index be3d6d92b99c..0434efe40b3c 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -139,6 +139,9 @@ class interp : public intrusive_list_node virtual void on_record_changed (inferior *inf, int started, const char *method, const char *format) {} + /* Notify the interpreter that the target was resumed. */ + virtual void on_target_resumed (ptid_t ptid) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -281,6 +284,9 @@ extern void interps_notify_record_changed (inferior *inf, int started, const char *method, const char *format); +/* Notify all interpreters that the target was resumed. */ +extern void interps_notify_target_resumed (ptid_t ptid); + /* 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 77050d0860fd..5c944febf427 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_on_resume (ptid_t ptid); static void mi_solib_loaded (struct so_list *solib); static void mi_solib_unloaded (struct so_list *solib); static void mi_about_to_proceed (void); @@ -801,8 +800,8 @@ mi_on_resume_1 (struct mi_interp *mi, gdb_flush (mi->raw_stdout); } -static void -mi_on_resume (ptid_t ptid) +void +mi_interp::on_target_resumed (ptid_t ptid) { struct thread_info *tp = NULL; @@ -816,18 +815,10 @@ mi_on_resume (ptid_t ptid) if (tp->control.in_infcall) 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 (); - mi_on_resume_1 (mi, target, ptid); - } + mi_on_resume_1 (this, target, ptid); } /* See mi-interp.h. */ @@ -1091,7 +1082,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp"); gdb::observers::solib_loaded.attach (mi_solib_loaded, "mi-interp"); gdb::observers::solib_unloaded.attach (mi_solib_unloaded, "mi-interp"); gdb::observers::about_to_proceed.attach (mi_about_to_proceed, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 29a437c14f26..fc0d8218ba73 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -58,6 +58,7 @@ class mi_interp final : public interp void on_inferior_removed (inferior *inf) override; void on_record_changed (inferior *inf, int started, const char *method, const char *format) override; + void on_target_resumed (ptid_t ptid) override; /* MI's output channels */ mi_console_file *out; diff --git a/gdb/thread.c b/gdb/thread.c index b7b5d9fdd993..7f7f035b5ab3 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -845,13 +845,22 @@ set_running_thread (struct thread_info *tp, bool running) return started; } +/* Notify interpreters and observers that the target was resumed. */ + +static void +notify_target_resumed (ptid_t ptid) +{ + interps_notify_target_resumed (ptid); + gdb::observers::target_resumed.notify (ptid); +} + /* See gdbthread.h. */ void thread_info::set_running (bool running) { if (set_running_thread (this, running)) - gdb::observers::target_resumed.notify (this->ptid); + notify_target_resumed (this->ptid); } void @@ -868,7 +877,7 @@ set_running (process_stratum_target *targ, ptid_t ptid, bool running) any_started = true; if (any_started) - gdb::observers::target_resumed.notify (ptid); + notify_target_resumed (ptid); } void @@ -916,7 +925,7 @@ finish_thread_state (process_stratum_target *targ, ptid_t ptid) any_started = true; if (any_started) - gdb::observers::target_resumed.notify (ptid); + notify_target_resumed (ptid); } /* See gdbthread.h. */ -- 2.40.1