forked from Imagelibrary/binutils-gdb
Before commit 3b6acaee89 "Update more calls to add_prefix_cmd" we had the
following output for "show logging file":
...
$ gdb -q -batch -ex "set trace-commands on" \
-ex "set logging off" \
-ex "show logging file" \
-ex "set logging on" \
-ex "show logging file"
+set logging off
+show logging file
Future logs will be written to gdb.txt.
+set logging on
+show logging file
Currently logging to "gdb.txt".
...
After that commit we have instead:
...
+set logging off
+show logging file
The current logfile is "gdb.txt".
+set logging on
+show logging file
The current logfile is "gdb.txt".
...
Before the commit, whether logging is enabled or not can be deduced from the
output of the command. After the commit, the message is unified and it's no
longer clear whether logging is enabled or not.
Fix this by:
- adding a new command "show logging enabled"
- adding a corresponding new command "set logging enabled on/off"
- making the commands "set logging on/off" deprecated aliases of the
"set logging enabled on/off" command.
Update the docs and testsuite to use "set logging enabled". Mention the new
and deprecated commands in NEWS.
Tested on x86_64-linux.
265 lines
8.1 KiB
C
265 lines
8.1 KiB
C
/* Command-line output logging for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2003-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "gdbcmd.h"
|
|
#include "ui-out.h"
|
|
#include "interps.h"
|
|
#include "cli/cli-style.h"
|
|
#include "cli/cli-decode.h"
|
|
|
|
static char *saved_filename;
|
|
|
|
static std::string logging_filename = "gdb.txt";
|
|
static void
|
|
show_logging_filename (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file, _("The current logfile is \"%ps\".\n"),
|
|
styled_string (file_name_style.style (), value));
|
|
}
|
|
|
|
static bool logging_overwrite;
|
|
|
|
static void
|
|
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 (const 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)
|
|
{
|
|
fprintf_filtered (file,
|
|
_("Whether logging overwrites or "
|
|
"appends to the log file is %s.\n"),
|
|
value);
|
|
}
|
|
|
|
/* Value as configured by the user. */
|
|
static bool logging_redirect;
|
|
static bool debug_redirect;
|
|
|
|
static void
|
|
set_logging_redirect (const char *args,
|
|
int from_tty, struct cmd_list_element *c)
|
|
{
|
|
maybe_warn_already_logging ();
|
|
}
|
|
|
|
static void
|
|
show_logging_redirect (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
fprintf_filtered (file, _("The logging output mode is %s.\n"), value);
|
|
}
|
|
|
|
/* If we've pushed output files, close them and pop them. */
|
|
static void
|
|
pop_output_files (void)
|
|
{
|
|
current_interp_set_logging (NULL, false, false);
|
|
|
|
/* Stay consistent with handle_redirections. */
|
|
if (!current_uiout->is_mi_like_p ())
|
|
current_uiout->redirect (NULL);
|
|
}
|
|
|
|
/* This is a helper for the `set logging' command. */
|
|
static void
|
|
handle_redirections (int from_tty)
|
|
{
|
|
if (saved_filename != NULL)
|
|
{
|
|
fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
|
|
saved_filename);
|
|
return;
|
|
}
|
|
|
|
stdio_file_up log (new no_terminal_escape_file ());
|
|
if (!log->open (logging_filename.c_str (), logging_overwrite ? "w" : "a"))
|
|
perror_with_name (_("set logging"));
|
|
|
|
/* Redirects everything to gdb_stdout while this is running. */
|
|
if (from_tty)
|
|
{
|
|
if (!logging_redirect)
|
|
fprintf_unfiltered (gdb_stdout, "Copying output to %s.\n",
|
|
logging_filename.c_str ());
|
|
else
|
|
fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
|
|
logging_filename.c_str ());
|
|
|
|
if (!debug_redirect)
|
|
fprintf_unfiltered (gdb_stdout, "Copying debug output to %s.\n",
|
|
logging_filename.c_str ());
|
|
else
|
|
fprintf_unfiltered (gdb_stdout, "Redirecting debug output to %s.\n",
|
|
logging_filename.c_str ());
|
|
}
|
|
|
|
saved_filename = xstrdup (logging_filename.c_str ());
|
|
|
|
/* Let the interpreter do anything it needs. */
|
|
current_interp_set_logging (std::move (log), logging_redirect,
|
|
debug_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
|
|
set_logging_on (const char *args, int from_tty)
|
|
{
|
|
const char *rest = args;
|
|
|
|
if (rest && *rest)
|
|
logging_filename = rest;
|
|
|
|
handle_redirections (from_tty);
|
|
}
|
|
|
|
static void
|
|
set_logging_off (const char *args, int from_tty)
|
|
{
|
|
if (saved_filename == NULL)
|
|
return;
|
|
|
|
pop_output_files ();
|
|
if (from_tty)
|
|
fprintf_unfiltered (gdb_stdout, "Done logging to %s.\n", saved_filename);
|
|
xfree (saved_filename);
|
|
saved_filename = NULL;
|
|
}
|
|
|
|
static bool logging_enabled;
|
|
|
|
static void
|
|
set_logging_enabled (const char *args,
|
|
int from_tty, struct cmd_list_element *c)
|
|
{
|
|
if (logging_enabled)
|
|
set_logging_on (args, from_tty);
|
|
else
|
|
set_logging_off (args, from_tty);
|
|
}
|
|
|
|
static void
|
|
show_logging_enabled (struct ui_file *file, int from_tty,
|
|
struct cmd_list_element *c, const char *value)
|
|
{
|
|
if (logging_enabled)
|
|
printf_unfiltered (_("Logging is enabled.\n"));
|
|
else
|
|
printf_unfiltered (_("Logging is disabled.\n"));
|
|
}
|
|
|
|
void _initialize_cli_logging ();
|
|
void
|
|
_initialize_cli_logging ()
|
|
{
|
|
static struct cmd_list_element *set_logging_cmdlist, *show_logging_cmdlist;
|
|
|
|
/* Set/show logging. */
|
|
add_setshow_prefix_cmd ("logging", class_support,
|
|
_("Set logging options."),
|
|
_("Show logging options."),
|
|
&set_logging_cmdlist, &show_logging_cmdlist,
|
|
&setlist, &showlist);
|
|
|
|
/* Set/show logging overwrite. */
|
|
add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite, _("\
|
|
Set whether logging overwrites or appends to the log file."), _("\
|
|
Show whether logging overwrites or appends to the log file."), _("\
|
|
If set, logging overwrites the log file."),
|
|
set_logging_overwrite,
|
|
show_logging_overwrite,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
|
|
/* Set/show logging redirect. */
|
|
add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, _("\
|
|
Set the logging output mode."), _("\
|
|
Show the logging output mode."), _("\
|
|
If redirect is off, output will go to both the screen and the log file.\n\
|
|
If redirect is on, output will go only to the log file."),
|
|
set_logging_redirect,
|
|
show_logging_redirect,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
|
|
/* Set/show logging debugredirect. */
|
|
add_setshow_boolean_cmd ("debugredirect", class_support,
|
|
&debug_redirect, _("\
|
|
Set the logging debug output mode."), _("\
|
|
Show the logging debug output mode."), _("\
|
|
If debug redirect is off, debug will go to both the screen and the log file.\n\
|
|
If debug redirect is on, debug will go only to the log file."),
|
|
set_logging_redirect,
|
|
show_logging_redirect,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
|
|
/* Set/show logging file. */
|
|
add_setshow_filename_cmd ("file", class_support, &logging_filename, _("\
|
|
Set the current logfile."), _("\
|
|
Show the current logfile."), _("\
|
|
The logfile is used when directing GDB's output."),
|
|
NULL,
|
|
show_logging_filename,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
|
|
/* Set/show logging enabled. */
|
|
set_show_commands setshow_logging_enabled_cmds
|
|
= add_setshow_boolean_cmd ("enabled", class_support, &logging_enabled,
|
|
_("Enable logging."),
|
|
_("Show whether logging is enabled."),
|
|
_("When on, enable logging."),
|
|
set_logging_enabled,
|
|
show_logging_enabled,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
|
|
/* Set logging on, deprecated alias. */
|
|
cmd_list_element *set_logging_on_cmd
|
|
= add_alias_cmd ("on", setshow_logging_enabled_cmds.set, class_support,
|
|
false, &set_logging_cmdlist);
|
|
deprecate_cmd (set_logging_on_cmd, "set logging enabled on");
|
|
set_logging_on_cmd->default_args = "on";
|
|
|
|
/* Set logging off, deprecated alias. */
|
|
cmd_list_element *set_logging_off_cmd
|
|
= add_alias_cmd ("off", setshow_logging_enabled_cmds.set, class_support,
|
|
false, &set_logging_cmdlist);
|
|
deprecate_cmd (set_logging_off_cmd, "set logging enabled off");
|
|
set_logging_off_cmd->default_args = "off";
|
|
}
|