From patchwork Tue May 2 20:49:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 68650 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 B074F385482C for ; Tue, 2 May 2023 20:51:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B074F385482C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683060685; bh=bwyVjImf16d/V14NQCd0RY1lZgHaV0IpY/nbJxngn/Y=; 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=cagfammRlbPuHm7KC8f70vZ/HL2cLJ6/7f1m6wJDsy5BwDO3/hQa3fEnrVCumU/Eu 1c/iUvJu7qOTtEaftUFza3X3Udu16U9swQQDj+p9mEdoWzpzR/4SZ0VLLDDHpG739j wfJyMVhWhCDomoLERE5VJzKLS0zrZ10qZNmceXCM= 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 0BD2D3858C1F for ; Tue, 2 May 2023 20:50:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BD2D3858C1F 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 625B11E121; Tue, 2 May 2023 16:50:14 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 05/30] gdb: add interp::on_signal_exited method Date: Tue, 2 May 2023 16:49:45 -0400 Message-Id: <20230502205011.132151-6-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 as previous patch, but for signal_exited. Remove the signal_exited observable, since nothing uses it anymore, and we don't have anything coming that will use it. Change-Id: I0dca1eab76338bf27be755786e3dad3241698b10 --- gdb/cli/cli-interp.c | 17 +++-------------- gdb/cli/cli-interp.h | 3 ++- gdb/infrun.c | 2 +- gdb/interps.c | 8 ++++++++ gdb/interps.h | 8 ++++++++ gdb/mi/mi-interp.c | 20 ++++---------------- gdb/mi/mi-interp.h | 1 + gdb/observable.c | 1 - gdb/observable.h | 3 --- 9 files changed, 27 insertions(+), 36 deletions(-) diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 9508171e87d5..aba73f142af8 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -134,19 +134,10 @@ cli_interp_base::on_signal_received (enum gdb_signal siggnal) print_signal_received_reason (this->interp_ui_out (), siggnal); } -/* Observer for the signalled notification. */ - -static void -cli_base_on_signal_exited (enum gdb_signal siggnal) +void +cli_interp_base::on_signal_exited (gdb_signal sig) { - SWITCH_THRU_ALL_UIS () - { - cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ()); - if (cli == nullptr) - continue; - - print_signal_exited_reason (cli->interp_ui_out (), siggnal); - } + print_signal_exited_reason (this->interp_ui_out (), sig); } /* Observer for the exited notification. */ @@ -388,8 +379,6 @@ _initialize_cli_interp () interp_factory_register (INTERP_CONSOLE, cli_interp_factory); /* Note these all work for both the CLI and TUI interpreters. */ - gdb::observers::signal_exited.attach (cli_base_on_signal_exited, - "cli-interp-base"); gdb::observers::exited.attach (cli_base_on_exited, "cli-interp-base"); gdb::observers::no_history.attach (cli_base_on_no_history, "cli-interp-base"); gdb::observers::sync_execution_done.attach (cli_base_on_sync_execution_done, diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 4fca801d4fd6..6342efa2dd59 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -34,7 +34,8 @@ class cli_interp_base : public interp bool supports_command_editing () override; void on_signal_received (gdb_signal sig) override; - void on_normal_stop(bpstat *bs, int print_frame) override; + void on_signal_exited (gdb_signal sig) override; + void on_normal_stop (bpstat *bs, int print_frame) override; private: struct saved_output_files diff --git a/gdb/infrun.c b/gdb/infrun.c index 8fa2cacc4149..c458e559b1da 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5754,7 +5754,7 @@ handle_inferior_event (struct execution_control_state *ecs) "signal number."); } - gdb::observers::signal_exited.notify (ecs->ws.sig ()); + interps_notify_signal_exited (ecs->ws.sig ()); } gdb_flush (gdb_stdout); diff --git a/gdb/interps.c b/gdb/interps.c index 80160bc45f34..566b5e1195ab 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -408,6 +408,14 @@ interps_notify_signal_received (gdb_signal sig) /* See interps.h. */ +void +interps_notify_signal_exited (gdb_signal sig) +{ + interps_notify (&interp::on_signal_exited, sig); +} + +/* See interps.h. */ + void interps_notify_normal_stop (bpstat *bs, int print_frame) { diff --git a/gdb/interps.h b/gdb/interps.h index dd5a9b70e339..752f2e8ea61b 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -87,6 +87,10 @@ class interp : public intrusive_list_node SIG. */ virtual void on_signal_received (gdb_signal sig) {} + /* Notify the interpreter that the current inferior has exited with signal + SIG. */ + virtual void on_signal_exited (gdb_signal sig) {} + /* Notify the interpreter that the current inferior has stopped normally. */ virtual void on_normal_stop (bpstat *bs, int print_frame) {} @@ -182,6 +186,10 @@ extern void interpreter_completer (struct cmd_list_element *ignore, SIG. */ extern void interps_notify_signal_received (gdb_signal sig); +/* Notify all interpreters that the current inferior has exited with signal + SIG. */ +extern void interps_notify_signal_exited (gdb_signal sig); + /* Notify all interpreters that the current inferior has stopped normally. */ extern void interps_notify_normal_stop (bpstat *bs, int print_frame); diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 5aeba46c4c28..2bf9e69393d4 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_signal_exited (enum gdb_signal siggnal); static void mi_on_exited (int exitstatus); static void mi_on_no_history (void); @@ -529,21 +528,11 @@ mi_interp::on_signal_received (enum gdb_signal siggnal) print_signal_received_reason (this->cli_uiout, siggnal); } -/* Observer for the signal_exited notification. */ - -static void -mi_on_signal_exited (enum gdb_signal siggnal) +void +mi_interp::on_signal_exited (gdb_signal sig) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = find_mi_interp (); - - if (mi == NULL) - continue; - - print_signal_exited_reason (mi->mi_uiout, siggnal); - print_signal_exited_reason (mi->cli_uiout, siggnal); - } + print_signal_exited_reason (this->mi_uiout, sig); + print_signal_exited_reason (this->cli_uiout, sig); } /* Observer for the exited notification. */ @@ -1274,7 +1263,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::signal_exited.attach (mi_on_signal_exited, "mi-interp"); gdb::observers::exited.attach (mi_on_exited, "mi-interp"); gdb::observers::no_history.attach (mi_on_no_history, "mi-interp"); gdb::observers::new_thread.attach (mi_new_thread, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index 444625f22c88..31e683319f89 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -43,6 +43,7 @@ class mi_interp final : public interp void pre_command_loop () override; void on_signal_received (gdb_signal sig) override; + void on_signal_exited (gdb_signal sig) override; void on_normal_stop (struct bpstat *bs, int print_frame) override; /* MI's output channels */ diff --git a/gdb/observable.c b/gdb/observable.c index 82563e3fab47..8cbf0377b0bc 100644 --- a/gdb/observable.c +++ b/gdb/observable.c @@ -34,7 +34,6 @@ bool observer_debug = false; DEFINE_OBSERVABLE (normal_stop); DEFINE_OBSERVABLE (signal_received); -DEFINE_OBSERVABLE (signal_exited); DEFINE_OBSERVABLE (exited); DEFINE_OBSERVABLE (no_history); DEFINE_OBSERVABLE (sync_execution_done); diff --git a/gdb/observable.h b/gdb/observable.h index e4e6f021f1a9..aaf1ddda4d42 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -57,9 +57,6 @@ extern observable normal_stop; /* The inferior was stopped by a signal. */ extern observable signal_received; -/* The inferior was terminated by a signal. */ -extern observable signal_exited; - /* The inferior program is finished. */ extern observable exited;