From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 531313858413 for ; Fri, 31 Dec 2021 20:19:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 531313858413 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id AED12100921EB for ; Fri, 31 Dec 2021 20:19:04 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 3OMinbub7nAlU3OMinRx5S; Fri, 31 Dec 2021 20:19:04 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=QIOt+iHL c=1 sm=1 tr=0 ts=61cf65b8 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IOMw9HtfNCkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=poHyP1p0O2cJ2lRqHI8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=T7S0CYANSkgZwnYUyRXpy0aXsz/8HfCkwJGoRqzLSXw=; b=VNgjlnK0JihbC1/cwAGCSLBnKC yXTHBOJayBPF3Q3DjEC6gVmH6ozA4trWTfRUtE3ORZOsxFNM8/sQc6gQmBCB3PYgFnt0t2C2yWyND VaxyFev9aBMEsv07ciLkV3M3u; Received: from 75-166-134-30.hlrn.qwest.net ([75.166.134.30]:52042 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n3OMh-001Rv4-Nf; Fri, 31 Dec 2021 13:19:03 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/4] Use unique_ptr in CLI logging code Date: Fri, 31 Dec 2021 13:18:59 -0700 Message-Id: <20211231201901.1567610-3-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211231201901.1567610-1-tom@tromey.com> References: <20211231201901.1567610-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.134.30 X-Source-L: No X-Exim-ID: 1n3OMh-001Rv4-Nf X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-134-30.hlrn.qwest.net (localhost.localdomain) [75.166.134.30]:52042 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L3, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Fri, 31 Dec 2021 20:19:06 -0000 This changes the CLI logging code to avoid manual memory management (to the extent possible) by using unique_ptr in a couple of spots. This will come in handy in a later patch. --- gdb/cli/cli-interp.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 3094775c9f5..031ab10aea6 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -395,9 +395,9 @@ struct saved_output_files ui_file *log; ui_file *targ; ui_file *targerr; - ui_file *file_to_delete; + ui_file_up file_to_delete; }; -static saved_output_files saved_output; +static std::unique_ptr saved_output; /* See cli-interp.h. */ @@ -407,12 +407,12 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, { if (logfile != nullptr) { - 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 (saved_output.file_to_delete == 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; /* If something is not being redirected, then a tee containing both the logfile and stdout. */ @@ -421,10 +421,10 @@ 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 = tee; + saved_output->file_to_delete.reset (tee); } else - saved_output.file_to_delete = logfile.release (); + saved_output->file_to_delete = std::move (logfile); gdb_stdout = logging_redirect ? logfile_p : tee; gdb_stdlog = debug_redirect ? logfile_p : tee; @@ -434,22 +434,13 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, } else { - /* Delete the correct file. If it's the tee then the logfile will also - be deleted. */ - delete saved_output.file_to_delete; - - 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; - - saved_output.out = nullptr; - saved_output.err = nullptr; - saved_output.log = nullptr; - saved_output.targ = nullptr; - saved_output.targerr = nullptr; - saved_output.file_to_delete = nullptr; + 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; + + saved_output.reset (nullptr); } } -- 2.31.1