From patchwork Thu Nov 17 18:29:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 60791 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 2786D3852212 for ; Thu, 17 Nov 2022 18:29:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2786D3852212 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668709781; bh=NgeAu17YjkrM4j+JNfjfZ52s14Ul/btYxBn6etTjOXM=; 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=Zjp0GnJQWW7jz6rAEdCB2HW55HLTzANTPKFRkUKPlQFONH57/UfBd0cS0PXd/+Zyu VfjE/YIn7ZYf4Mnq2NJHpq9PyahBJ3CkMSDRD45eCUIzRIPDj+JVebdtcr0xxYBHh9 oRZtblAOKUsKQKa3gKciWsSJNjJuB3TpWlW+WIyc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id 7BB00385457E for ; Thu, 17 Nov 2022 18:29:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BB00385457E Received: by mail-io1-xd36.google.com with SMTP id n188so2026064iof.8 for ; Thu, 17 Nov 2022 10:29:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NgeAu17YjkrM4j+JNfjfZ52s14Ul/btYxBn6etTjOXM=; b=PgBzNlU9koocVW7PrJDo0bskmqW91uqZYPEogdwWrpzf3+fvZihxlB/1CFOApZQ/A/ zP14uTcF5lYK38qeruEyqb665lV+ga6T2nCY4tSMxI2B+Qpl0YqPdSJbfi/Gjt3ZOMc8 qqG/b9tkMREpjBWvKOnkIUDsfU4biGJDgjcJEa3DnV1S9vbZ32ChpWdBJnZGPbrcmi8x kQBRL0Yjf9kjG3/NzP73dunqvbWuyWA2TmsixOv0cUsNJqG1FGWUUfb8xyD8+rUWOVKD qictnraiOyeyMm61tDjk8/ichI01L1Ot4Te1RciwUZlac6loPuYadk4VGzzjTKP8cOrS zs9g== X-Gm-Message-State: ANoB5plT7jcVdlycaOgqc0I6HHUrL11E2Q1Zyog0mK+GLBouvCbAmM14 fFDT0RSdBlfigjp/wSaMkFwP2lUp9f0J0A== X-Google-Smtp-Source: AA0mqf4RuBfgk4rT9PAQZsJ8TsqIQDsPNVJ+5j953C31LkKwRyWq6Hhb43P8CsMiEPAGIIibmHleZw== X-Received: by 2002:a5d:8741:0:b0:6cd:6e75:69fd with SMTP id k1-20020a5d8741000000b006cd6e7569fdmr1994324iol.49.1668709754747; Thu, 17 Nov 2022 10:29:14 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id g68-20020a025b47000000b00365c1bd9ac7sm469409jab.113.2022.11.17.10.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 10:29:14 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/3] Remove 'saved_output' global Date: Thu, 17 Nov 2022 11:29:02 -0700 Message-Id: <20221117182904.1291713-2-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20221117182904.1291713-1-tromey@adacore.com> References: <20221117182904.1291713-1-tromey@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" CLI redirect uses a global variable, 'saved_output'. However, globals are generally bad, and there is no need for this one -- it can be a member of cli_interp_base. This patch makes this change. --- gdb/cli/cli-interp.c | 47 ++++++++++++++++---------------------------- gdb/cli/cli-interp.h | 16 +++++++++++++++ 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index ca3a1abcaae..8c2fb207486 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -370,20 +370,6 @@ cli_interp::interp_ui_out () return m_cli_uiout.get (); } -/* These hold the pushed copies of the gdb output files. - If NULL then nothing has yet been pushed. */ -struct saved_output_files -{ - ui_file *out; - ui_file *err; - ui_file *log; - ui_file *targ; - ui_file *targerr; - ui_file_up file_to_delete; - ui_file_up log_to_delete; -}; -static std::unique_ptr saved_output; - /* See cli-interp.h. */ void @@ -392,12 +378,13 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, { if (logfile != nullptr) { - saved_output.reset (new saved_output_files); - saved_output->out = gdb_stdout; - saved_output->err = gdb_stderr; - saved_output->log = gdb_stdlog; - saved_output->targ = gdb_stdtarg; - saved_output->targerr = gdb_stdtargerr; + gdb_assert (m_saved_output == nullptr); + m_saved_output.reset (new saved_output_files); + m_saved_output->out = gdb_stdout; + m_saved_output->err = gdb_stderr; + m_saved_output->log = gdb_stdlog; + m_saved_output->targ = gdb_stdtarg; + m_saved_output->targerr = gdb_stdtargerr; /* If something is not being redirected, then a tee containing both the logfile and stdout. */ @@ -406,29 +393,29 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, if (!logging_redirect || !debug_redirect) { tee = new tee_file (gdb_stdout, std::move (logfile)); - saved_output->file_to_delete.reset (tee); + m_saved_output->file_to_delete.reset (tee); } else - saved_output->file_to_delete = std::move (logfile); + m_saved_output->file_to_delete = std::move (logfile); - saved_output->log_to_delete.reset + m_saved_output->log_to_delete.reset (new timestamped_file (debug_redirect ? logfile_p : tee)); gdb_stdout = logging_redirect ? logfile_p : tee; - gdb_stdlog = saved_output->log_to_delete.get (); + gdb_stdlog = m_saved_output->log_to_delete.get (); gdb_stderr = logging_redirect ? logfile_p : tee; gdb_stdtarg = logging_redirect ? logfile_p : tee; gdb_stdtargerr = logging_redirect ? logfile_p : tee; } else { - gdb_stdout = saved_output->out; - gdb_stderr = saved_output->err; - gdb_stdlog = saved_output->log; - gdb_stdtarg = saved_output->targ; - gdb_stdtargerr = saved_output->targerr; + gdb_stdout = m_saved_output->out; + gdb_stderr = m_saved_output->err; + gdb_stdlog = m_saved_output->log; + gdb_stdtarg = m_saved_output->targ; + gdb_stdtargerr = m_saved_output->targerr; - saved_output.reset (nullptr); + m_saved_output.reset (nullptr); } } diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 1620305c26b..3c233c0a229 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -32,6 +32,22 @@ class cli_interp_base : public interp bool debug_redirect) override; void pre_command_loop () override; bool supports_command_editing () override; + +private: + struct saved_output_files + { + ui_file *out; + ui_file *err; + ui_file *log; + ui_file *targ; + ui_file *targerr; + ui_file_up file_to_delete; + ui_file_up log_to_delete; + }; + + /* These hold the pushed copies of the gdb output files. If NULL + then nothing has yet been pushed. */ + std::unique_ptr m_saved_output; }; /* Returns true if the current stop should be printed to