From patchwork Tue May 2 20:49:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 68659 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 DE8BA3857720 for ; Tue, 2 May 2023 20:54:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE8BA3857720 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683060882; bh=vZ8TxZrTOUj7IdSdQVdkHEh4+cm3zlKemsNuLIjwCCA=; 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=IsTNTZnU6k81UwPTVyZ6MrJh4c4dRVWwX2ciRSgAKNbIiBgXY/8mP01FqlmbZ9gKx EkJHctQkfYqgfGpyCaA1R9DZdm+XwSma9vPI0/wzHR+xDPBUUPZgp1qA4mDPjb4ges SvCe3LNdndbyF84QFvaAuVbAsIM0FCSDb08gpZsM= 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 BC3C5385772A for ; Tue, 2 May 2023 20:52:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BC3C5385772A 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 6D6871E11E; Tue, 2 May 2023 16:52:21 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 15/30] gdb: add interp::on_inferior_disappeared method Date: Tue, 2 May 2023 16:49:55 -0400 Message-Id: <20230502205011.132151-16-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 inferior_disappeared. For symmetry with on_inferior_appeared, I named this one on_inferior_disappeared, despite the observer being called inferior_exit. This is called when detaching an inferior, so I think that calling it "disappeared" is a bit less misleading (the observer should probably be renamed later). Change-Id: I372101586bc9454997953c1e540a2a6685f53ef6 --- gdb/inferior.c | 11 ++++++++++- gdb/interps.c | 8 ++++++++ gdb/interps.h | 6 ++++++ gdb/mi/mi-interp.c | 34 ++++++++++++---------------------- gdb/mi/mi-interp.h | 1 + 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gdb/inferior.c b/gdb/inferior.c index 46d418a2be39..32fe9ccbd659 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -283,6 +283,15 @@ delete_inferior (struct inferior *inf) delete inf; } +/* Notify interpreters and observers that inferior INF disappeared. */ + +static void +notify_inferior_disappeared (inferior *inf) +{ + interps_notify_inferior_disappeared (inf); + gdb::observers::inferior_exit.notify (inf); +} + /* If SILENT then be quiet -- don't announce a inferior exit, or the exit of its threads. */ @@ -291,7 +300,7 @@ exit_inferior_1 (struct inferior *inf, int silent) { inf->clear_thread_list (silent); - gdb::observers::inferior_exit.notify (inf); + notify_inferior_disappeared (inf); inf->pid = 0; inf->fake_pid_p = false; diff --git a/gdb/interps.c b/gdb/interps.c index ed33df2efd4c..46b0ecbd73fa 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -478,6 +478,14 @@ interps_notify_inferior_appeared (inferior *inf) interps_notify (&interp::on_inferior_appeared, inf); } +/* See interps.h. */ + +void +interps_notify_inferior_disappeared (inferior *inf) +{ + interps_notify (&interp::on_inferior_disappeared, inf); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index 09edaaeb0036..b1aee5db8290 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -128,6 +128,9 @@ class interp : public intrusive_list_node /* Notify the interpreter that inferior INF was started or attached. */ virtual void on_inferior_appeared (inferior *inf) {} + /* Notify the interpreter that inferior INF exited or was detached. */ + virtual void on_inferior_disappeared (inferior *inf) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -251,6 +254,9 @@ extern void interps_notify_inferior_added (inferior *inf); /* Notify all interpreters that inferior INF was started or attached. */ extern void interps_notify_inferior_appeared (inferior *inf); +/* Notify all interpreters that inferior INF exited or was detached. */ +extern void interps_notify_inferior_disappeared (inferior *inf); + /* 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 3f0aaa7702a5..f6ce077d8b9e 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -62,7 +62,6 @@ static void mi_remove_notify_hooks (void); static void mi_record_changed (struct inferior*, int, const char *, const char *); -static void mi_inferior_exit (struct inferior *inf); static void mi_inferior_removed (struct inferior *inf); static void mi_on_resume (ptid_t ptid); static void mi_solib_loaded (struct so_list *solib); @@ -378,29 +377,21 @@ mi_interp::on_inferior_appeared (inferior *inf) gdb_flush (this->event_channel); } -static void -mi_inferior_exit (struct inferior *inf) +void +mi_interp::on_inferior_disappeared (inferior *inf) { - 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 (inf->has_exit_code) - gdb_printf (mi->event_channel, - "thread-group-exited,id=\"i%d\",exit-code=\"%s\"", - inf->num, int_string (inf->exit_code, 8, 0, 0, 1)); - else - gdb_printf (mi->event_channel, - "thread-group-exited,id=\"i%d\"", inf->num); + if (inf->has_exit_code) + gdb_printf (this->event_channel, + "thread-group-exited,id=\"i%d\",exit-code=\"%s\"", + inf->num, int_string (inf->exit_code, 8, 0, 0, 1)); + else + gdb_printf (this->event_channel, + "thread-group-exited,id=\"i%d\"", inf->num); - gdb_flush (mi->event_channel); - } + gdb_flush (this->event_channel); } static void @@ -1129,7 +1120,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::inferior_exit.attach (mi_inferior_exit, "mi-interp"); gdb::observers::inferior_removed.attach (mi_inferior_removed, "mi-interp"); gdb::observers::record_changed.attach (mi_record_changed, "mi-interp"); gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 3872577121cf..5db17a6d2684 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -54,6 +54,7 @@ class mi_interp final : public interp void on_thread_exited (thread_info *t, int silent) override; void on_inferior_added (inferior *inf) override; void on_inferior_appeared (inferior *inf) override; + void on_inferior_disappeared (inferior *inf) override; /* MI's output channels */ mi_console_file *out;