/* Command-line output logging for GDB, the GNU debugger.
- Copyright (C) 2003-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "ui-out.h"
#include "interps.h"
-/* These hold the pushed copies of the gdb output files.
- If NULL then nothing has yet been pushed. */
-struct saved_output_files
-{
- struct ui_file *out;
- struct ui_file *err;
- struct ui_file *log;
- struct ui_file *targ;
- struct ui_file *targerr;
-};
-static struct saved_output_files saved_output;
static char *saved_filename;
static char *logging_filename;
static int logging_overwrite;
static void
-set_logging_overwrite (char *args, int from_tty, struct cmd_list_element *c)
+maybe_warn_already_logging ()
{
if (saved_filename)
warning (_("Currently logging to %s. Turn the logging off and on to "
"make the new setting effective."), saved_filename);
}
+static void
+set_logging_overwrite (char *args, int from_tty, struct cmd_list_element *c)
+{
+ maybe_warn_already_logging ();
+}
+
static void
show_logging_overwrite (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
/* Value as configured by the user. */
static int logging_redirect;
-/* The on-disk file in use if logging is currently active together
- with redirection turned off (and therefore using tee_file_new).
- For active logging with redirection the on-disk file is directly in
- GDB_STDOUT and this variable is NULL. */
-static struct ui_file *logging_no_redirect_file;
-
static void
set_logging_redirect (char *args, int from_tty, struct cmd_list_element *c)
{
- struct cleanup *cleanups;
- struct ui_file *output, *new_logging_no_redirect_file;
- struct ui_out *uiout = current_uiout;
-
- if (saved_filename == NULL
- || (logging_redirect != 0 && logging_no_redirect_file == NULL)
- || (logging_redirect == 0 && logging_no_redirect_file != NULL))
- return;
-
- cleanups = make_cleanup (null_cleanup, NULL);
-
- if (logging_redirect != 0)
- {
- gdb_assert (logging_no_redirect_file != NULL);
-
- /* ui_out_redirect still has not been called for next
- gdb_stdout. */
- make_cleanup_ui_file_delete (gdb_stdout);
-
- output = logging_no_redirect_file;
- new_logging_no_redirect_file = NULL;
-
- if (from_tty)
- fprintf_unfiltered (saved_output.out, "Redirecting output to %s.\n",
- logging_filename);
- }
- else
- {
- gdb_assert (logging_no_redirect_file == NULL);
- output = tee_file_new (saved_output.out, 0, gdb_stdout, 0);
- if (output == NULL)
- perror_with_name (_("set logging"));
- new_logging_no_redirect_file = gdb_stdout;
-
- if (from_tty)
- fprintf_unfiltered (saved_output.out, "Copying output to %s.\n",
- logging_filename);
- }
-
- /* Give the current interpreter a chance to do anything special that
- it might need for logging, such as updating other channels. */
- if (current_interp_set_logging (1, output, NULL) == 0)
- {
- gdb_stdout = output;
- gdb_stdlog = output;
- gdb_stderr = output;
- gdb_stdtarg = output;
- gdb_stdtargerr = output;
- }
-
- logging_no_redirect_file = new_logging_no_redirect_file;
-
- /* There is a former output pushed on the ui_out_redirect stack. We
- want to replace it by OUTPUT so we must pop the former value
- first. We should either do both the pop and push or to do
- neither of it. At least do not try to push OUTPUT if the pop
- already failed. */
-
- if (ui_out_redirect (uiout, NULL) < 0
- || ui_out_redirect (uiout, output) < 0)
- warning (_("Current output protocol does not support redirection"));
-
- do_cleanups (cleanups);
+ maybe_warn_already_logging ();
}
static void
static void
pop_output_files (void)
{
- if (logging_no_redirect_file)
- {
- ui_file_delete (logging_no_redirect_file);
- logging_no_redirect_file = NULL;
- }
+ current_interp_set_logging (NULL, false);
- if (current_interp_set_logging (0, NULL, NULL) == 0)
- {
- /* Only delete one of the files -- they are all set to the same
- value. */
- ui_file_delete (gdb_stdout);
-
- 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;
- }
+ /* Stay consistent with handle_redirections. */
+ if (!current_uiout->is_mi_like_p ())
+ current_uiout->redirect (NULL);
+}
- saved_output.out = NULL;
- saved_output.err = NULL;
- saved_output.log = NULL;
- saved_output.targ = NULL;
- saved_output.targerr = NULL;
+/* See cli-interp.h. */
- ui_out_redirect (current_uiout, NULL);
+ui_file *
+make_logging_output (ui_file *curr_output, ui_file_up logfile,
+ bool logging_redirect)
+{
+ if (logging_redirect)
+ return logfile.release ();
+ else
+ {
+ /* Note that the "tee" takes ownership of the log file. */
+ ui_file *out = new tee_file (curr_output, false,
+ logfile.get (), true);
+ logfile.release ();
+ return out;
+ }
}
/* This is a helper for the `set logging' command. */
static void
handle_redirections (int from_tty)
{
- struct cleanup *cleanups;
- struct ui_file *output;
- struct ui_file *no_redirect_file = NULL;
-
if (saved_filename != NULL)
{
fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
return;
}
- output = gdb_fopen (logging_filename, logging_overwrite ? "w" : "a");
- if (output == NULL)
+ stdio_file_up log (new stdio_file ());
+ if (!log->open (logging_filename, logging_overwrite ? "w" : "a"))
perror_with_name (_("set logging"));
- cleanups = make_cleanup_ui_file_delete (output);
/* Redirects everything to gdb_stdout while this is running. */
- if (!logging_redirect)
+ if (from_tty)
{
- no_redirect_file = output;
-
- output = tee_file_new (gdb_stdout, 0, no_redirect_file, 0);
- if (output == NULL)
- perror_with_name (_("set logging"));
- make_cleanup_ui_file_delete (output);
- if (from_tty)
+ if (!logging_redirect)
fprintf_unfiltered (gdb_stdout, "Copying output to %s.\n",
logging_filename);
- logging_no_redirect_file = no_redirect_file;
- }
- else
- {
- gdb_assert (logging_no_redirect_file == NULL);
-
- if (from_tty)
+ else
fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
logging_filename);
}
- discard_cleanups (cleanups);
-
saved_filename = xstrdup (logging_filename);
- 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;
/* Let the interpreter do anything it needs. */
- if (current_interp_set_logging (1, output, no_redirect_file) == 0)
- {
- gdb_stdout = output;
- gdb_stdlog = output;
- gdb_stderr = output;
- gdb_stdtarg = output;
- gdb_stdtargerr = output;
- }
-
- /* Don't do the redirect for MI, it confuses MI's ui-out scheme. */
- if (!ui_out_is_mi_like_p (current_uiout))
- {
- if (ui_out_redirect (current_uiout, output) < 0)
- warning (_("Current output protocol does not support redirection"));
- }
+ current_interp_set_logging (std::move (log), logging_redirect);
+
+ /* Redirect the current ui-out object's output to the log. Use
+ gdb_stdout, not log, since the interpreter may have created a tee
+ that wraps the log. Don't do the redirect for MI, it confuses
+ MI's ui-out scheme. Note that we may get here with MI as current
+ interpreter, but with the current ui_out as a CLI ui_out, with
+ '-interpreter-exec console "set logging on"'. */
+ if (!current_uiout->is_mi_like_p ())
+ current_uiout->redirect (gdb_stdout);
}
static void
else
printf_unfiltered (_("Logs will be appended to the log file.\n"));
- if (saved_filename)
- {
- if (logging_redirect)
- printf_unfiltered (_("Output is being sent only to the log file.\n"));
- else
- printf_unfiltered (_("Output is being logged and displayed.\n"));
- }
+ if (logging_redirect)
+ printf_unfiltered (_("Output will be sent only to the log file.\n"));
else
- {
- if (logging_redirect)
- printf_unfiltered (_("Output will be sent only to the log file.\n"));
- else
- printf_unfiltered (_("Output will be logged and displayed.\n"));
- }
+ printf_unfiltered (_("Output will be logged and displayed.\n"));
}
/* Provide a prototype to silence -Wmissing-prototypes. */
projects / deliverable / binutils-gdb.git / blobdiff