espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 03:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'saved_output' global

Browse Source 
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.
This commit is contained in:
Tom Tromey
2022-11-17 08:16:44 -07:00
parent e1df90510a
commit 19622df10d
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gdb/cli/cli-interp.c
View File

@ -370,20 +370,6 @@ cli_interp::interp_ui_out ()
return m_cli_uiout.get (); 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_files> saved_output;
/* See cli-interp.h. */ /* See cli-interp.h. */
void void
@ -392,12 +378,13 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect,
{ {
if (logfile != nullptr) if (logfile != nullptr)
{ {
saved_output.reset (new saved_output_files); gdb_assert (m_saved_output == nullptr);
saved_output->out = gdb_stdout; m_saved_output.reset (new saved_output_files);
saved_output->err = gdb_stderr; m_saved_output->out = gdb_stdout;
saved_output->log = gdb_stdlog; m_saved_output->err = gdb_stderr;
saved_output->targ = gdb_stdtarg; m_saved_output->log = gdb_stdlog;
saved_output->targerr = gdb_stdtargerr; m_saved_output->targ = gdb_stdtarg;
m_saved_output->targerr = gdb_stdtargerr;
/* If something is not being redirected, then a tee containing both the /* If something is not being redirected, then a tee containing both the
logfile and stdout. */ logfile and stdout. */
@ -406,29 +393,29 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect,
if (!logging_redirect || !debug_redirect) if (!logging_redirect || !debug_redirect)
{ {
tee = new tee_file (gdb_stdout, std::move (logfile)); 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 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)); (new timestamped_file (debug_redirect ? logfile_p : tee));
gdb_stdout = logging_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_stderr = logging_redirect ? logfile_p : tee;
gdb_stdtarg = logging_redirect ? logfile_p : tee; gdb_stdtarg = logging_redirect ? logfile_p : tee;
gdb_stdtargerr = logging_redirect ? logfile_p : tee; gdb_stdtargerr = logging_redirect ? logfile_p : tee;
} }
else else
{ {
gdb_stdout = saved_output->out; gdb_stdout = m_saved_output->out;
gdb_stderr = saved_output->err; gdb_stderr = m_saved_output->err;
gdb_stdlog = saved_output->log; gdb_stdlog = m_saved_output->log;
gdb_stdtarg = saved_output->targ; gdb_stdtarg = m_saved_output->targ;
gdb_stdtargerr = saved_output->targerr; gdb_stdtargerr = m_saved_output->targerr;
saved_output.reset (nullptr); m_saved_output.reset (nullptr);
} }
} }

16
gdb/cli/cli-interp.h
View File

@ -32,6 +32,22 @@ public:
bool debug_redirect) override; bool debug_redirect) override;
void pre_command_loop () override; void pre_command_loop () override;
bool supports_command_editing () 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<saved_output_files> m_saved_output;
}; };
/* Returns true if the current stop should be printed to /* Returns true if the current stop should be printed to