From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 9631338532F0; Mon, 28 Nov 2022 20:41:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9631338532F0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669668096; bh=uT33q0Pk9jvhMzLmpRqNJY2C9rKco2HrRAq4W7mvQR4=; h=From:To:Subject:Date:From; b=Q7cXvMP3hXMYv4G/dDEHCeMcWNQ/PKQp/DRExoKlAp7DQBxMb9S7SO0lPowz19CwQ hBqP5ozu0cIMidfbFK1Q0zxDUnVOEzVsysx5DNDTcSbUKWyES8Oo5ChzG+6S3Ta9Yh f2RXYY45Or4eTnTKeSpLPMeJatoOl26y08D8tEE4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove 'saved_output' global X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: e1df90510a85d08eae165d868d6aa20bc1d09203 X-Git-Newrev: 19622df10dd5a8d3567e79d0661770029e4fbcfe Message-Id: <20221128204136.9631338532F0@sourceware.org> Date: Mon, 28 Nov 2022 20:41:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D19622df10dd5= a8d3567e79d0661770029e4fbcfe commit 19622df10dd5a8d3567e79d0661770029e4fbcfe Author: Tom Tromey Date: Thu Nov 17 08:16:44 2022 -0700 Remove 'saved_output' global =20 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. Diff: --- 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 (); } =20 -/* 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. */ =20 void @@ -392,12 +378,13 @@ cli_interp_base::set_logging (ui_file_up logfile, boo= l logging_redirect, { if (logfile !=3D nullptr) { - saved_output.reset (new saved_output_files); - saved_output->out =3D gdb_stdout; - saved_output->err =3D gdb_stderr; - saved_output->log =3D gdb_stdlog; - saved_output->targ =3D gdb_stdtarg; - saved_output->targerr =3D gdb_stdtargerr; + gdb_assert (m_saved_output =3D=3D nullptr); + m_saved_output.reset (new saved_output_files); + m_saved_output->out =3D gdb_stdout; + m_saved_output->err =3D gdb_stderr; + m_saved_output->log =3D gdb_stdlog; + m_saved_output->targ =3D gdb_stdtarg; + m_saved_output->targerr =3D gdb_stdtargerr; =20 /* 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, boo= l logging_redirect, if (!logging_redirect || !debug_redirect) { tee =3D 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 =3D std::move (logfile); + m_saved_output->file_to_delete =3D std::move (logfile); =20 - saved_output->log_to_delete.reset + m_saved_output->log_to_delete.reset (new timestamped_file (debug_redirect ? logfile_p : tee)); =20 gdb_stdout =3D logging_redirect ? logfile_p : tee; - gdb_stdlog =3D saved_output->log_to_delete.get (); + gdb_stdlog =3D m_saved_output->log_to_delete.get (); gdb_stderr =3D logging_redirect ? logfile_p : tee; gdb_stdtarg =3D logging_redirect ? logfile_p : tee; gdb_stdtargerr =3D logging_redirect ? logfile_p : tee; } else { - gdb_stdout =3D saved_output->out; - gdb_stderr =3D saved_output->err; - gdb_stdlog =3D saved_output->log; - gdb_stdtarg =3D saved_output->targ; - gdb_stdtargerr =3D saved_output->targerr; + gdb_stdout =3D m_saved_output->out; + gdb_stderr =3D m_saved_output->err; + gdb_stdlog =3D m_saved_output->log; + gdb_stdtarg =3D m_saved_output->targ; + gdb_stdtargerr =3D m_saved_output->targerr; =20 - saved_output.reset (nullptr); + m_saved_output.reset (nullptr); } } =20 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 @@ public: 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; }; =20 /* Returns true if the current stop should be printed to