From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sT0pNKTZ0WhEmg4AWB0awg (envelope-from ) for ; Mon, 22 Sep 2025 19:20:04 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=uofr.net header.i=@uofr.net header.a=rsa-sha256 header.s=selector-1 header.b=fZKVD+8n; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D00B51E04C; Mon, 22 Sep 2025 19:20:04 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8DB501E04C for ; Mon, 22 Sep 2025 19:20:03 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 22CB43858419 for ; Mon, 22 Sep 2025 23:20:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22CB43858419 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=uofr.net header.i=@uofr.net header.a=rsa-sha256 header.s=selector-1 header.b=fZKVD+8n Received: from uofr.net (uofr.net [50.116.51.30]) by sourceware.org (Postfix) with ESMTPS id 3174D3858C54 for ; Mon, 22 Sep 2025 23:18:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3174D3858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=malsyned.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=malsyned.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3174D3858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=50.116.51.30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1758583107; cv=none; b=VLu0sf+UBGU0r98t6YZpEeiBXRGfmInrR3kdOAQFHzT/tvZ07EKvaws8ovChW2REq18EaAMYI3kaC3gxDawhrCznjXYxrJCfhqFgUE8MGF5bXMJE3F7NJXqhloVk6gguiQmq8uNW8AiwO2Oj7idUmd2swUtXEebClHG4a2d/fx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1758583107; c=relaxed/simple; bh=2Fr8s2+fp7ZpB4hKZEwTMVdGiWcE+aH0DBW4KEth/qs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TnhVRcFf/mz8/GWe2DijUmkcapuKNbQPTn00BtbKNQeS3GJWsZ9SuEHxoNSGocAE11kwV+AtV2W/J+FJwbnbBzYDLO9FOGX2mLdB0LQFc/Xmbw0YMi5LSpBkz3ZJNBRS+gZRKz/GdSh7DFHjf7Fm4FxsScLdVy2Untzro36PqX4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3174D3858C54 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net; s=selector-1; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=7H98RKQLRpFPYtpZn852Slh/hIxji3DBvlabUoiGPD0=; b=fZKVD+8nsbdcNOi0wChJ4kzaEq npuPdri9fe7+JPPSy35a2nv3FKrLAyln/iCwzFhzb8NtGhvFMhvvpUNgKHJeDaPptOOG7W/hOFlSE yqLqCKGdOSaGiEdPYaedmHmuS6xei/89hJnDgYucMmQm4wEDwhcVhBinw2RL0SZ1klUk=; Received: from c-75-67-96-172.hsd1.ma.comcast.net ([75.67.96.172] helo=malsyned.hsd1.ma.comcast.net) by uofr.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1v0pne-00B0ww-QP for gdb-patches@sourceware.org; Mon, 22 Sep 2025 19:18:26 -0400 From: "Dennis Lambe Jr." To: gdb-patches@sourceware.org Subject: [RFC][PATCH 3/5] [PR gdb/33469] mi_ui_out: redirect: push separator state when async = true Date: Mon, 22 Sep 2025 19:18:18 -0400 Message-ID: <20250922231820.2667505-4-malsyned@malsyned.net> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250922231820.2667505-1-malsyned@malsyned.net> References: <20250922231820.2667505-1-malsyned@malsyned.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org * Convert m_suppress_field_separator from a bool to a std::vector. * When do_redirect() is called with async = true, push a new value onto m_suppress_field_separator. --- gdb/mi/mi-out.c | 28 +++++++++++++++++++++------- gdb/mi/mi-out.h | 4 +++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 6adf108b1cc..1aafbb39f32 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -187,18 +187,32 @@ mi_ui_out::do_flush () void mi_ui_out::do_redirect (ui_file *outstream) +{ + do_redirect (outstream, false); +} + +void +mi_ui_out::do_redirect (ui_file *outstream, bool async) { if (outstream != NULL) - m_streams.push_back (outstream); + { + m_streams.push_back (outstream); + if (async) + m_suppress_field_separator.push_back (false); + } else - m_streams.pop_back (); + { + m_streams.pop_back (); + if (async) + m_suppress_field_separator.pop_back (); + } } void mi_ui_out::field_separator () { - if (m_suppress_field_separator) - m_suppress_field_separator = false; + if (m_suppress_field_separator.back ()) + m_suppress_field_separator.back () = false; else gdb_putc (',', m_streams.back ()); } @@ -209,7 +223,7 @@ mi_ui_out::open (const char *name, ui_out_type type) ui_file *stream = m_streams.back (); field_separator (); - m_suppress_field_separator = true; + m_suppress_field_separator.back () = true; if (name) gdb_printf (stream, "%s=", name); @@ -248,7 +262,7 @@ mi_ui_out::close (ui_out_type type) internal_error (_("bad switch")); } - m_suppress_field_separator = false; + m_suppress_field_separator.back () = false; } string_file * @@ -322,11 +336,11 @@ mi_ui_out::version () mi_ui_out::mi_ui_out (int mi_version) : ui_out (make_flags (mi_version)), - m_suppress_field_separator (false), m_mi_version (mi_version) { string_file *stream = new string_file (); m_streams.push_back (stream); + m_suppress_field_separator.push_back (false); } mi_ui_out::~mi_ui_out () diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h index ec3de74ab60..2a64d8f08d1 100644 --- a/gdb/mi/mi-out.h +++ b/gdb/mi/mi-out.h @@ -84,6 +84,8 @@ class mi_ui_out : public ui_out virtual void do_wrap_hint (int indent) override; virtual void do_flush () override; virtual void do_redirect (struct ui_file *outstream) override; + virtual void do_redirect (struct ui_file *outstream, + bool push_state) override; virtual bool do_is_mi_like_p () const override { return true; } @@ -138,7 +140,7 @@ class mi_ui_out : public ui_out return flags; } - bool m_suppress_field_separator; + std::vector m_suppress_field_separator; int m_mi_version; std::vector m_streams; }; -- 2.51.0