/* Support for GDB maintenance commands.
- Copyright (C) 1992-2014 Free Software Foundation, Inc.
+ Copyright (C) 1992-2017 Free Software Foundation, Inc.
Written by Fred Fish at Cygnus Support.
#include "arch-utils.h"
#include <ctype.h>
#include <signal.h>
-#include <sys/time.h>
-#include <time.h>
#include "command.h"
#include "gdbcmd.h"
#include "symtab.h"
#include "symfile.h"
#include "objfiles.h"
#include "value.h"
-#include "gdb_assert.h"
#include "top.h"
-#include "timeval-utils.h"
#include "maint.h"
+#include "selftest.h"
#include "cli/cli-decode.h"
#include "cli/cli-utils.h"
demangler_warning (__FILE__, __LINE__, "%s", (args == NULL ? "" : args));
}
-/* Someday we should allow demangling for things other than just
- explicit strings. For example, we might want to be able to specify
- the address of a string in either GDB's process space or the
- debuggee's process space, and have gdb fetch and demangle that
- string. If we have a char* pointer "ptr" that points to a string,
- we might want to be able to given just the name and have GDB
- demangle and print what it points to, etc. (FIXME) */
+/* Old command to demangle a string. The command has been moved to "demangle".
+ It is kept for now because otherwise "mt demangle" gets interpreted as
+ "mt demangler-warning" which artificially creates an internal gdb error. */
static void
maintenance_demangle (char *args, int from_tty)
{
- char *demangled;
-
- if (args == NULL || *args == '\0')
- {
- printf_unfiltered (_("\"maintenance demangle\" takes "
- "an argument to demangle.\n"));
- }
- else
- {
- demangled = language_demangle (current_language, args,
- DMGL_ANSI | DMGL_PARAMS);
- if (demangled != NULL)
- {
- printf_unfiltered ("%s\n", demangled);
- xfree (demangled);
- }
- else
- {
- printf_unfiltered (_("Can't demangle \"%s\"\n"), args);
- }
- }
+ printf_filtered (_("This command has been moved to \"demangle\".\n"));
}
static void
gdb_stdout);
}
+/* The "maintenance check" command is defined as a prefix, with
+ allow_unknown 0. Therefore, its own definition is called only for
+ "maintenance check" with no args. */
+
+static void
+maintenance_check_command (char *arg, int from_tty)
+{
+ printf_unfiltered (_("\"maintenance check\" must be followed "
+ "by the name of a check command.\n"));
+ help_list (maintenancechecklist, "maintenance check ", all_commands,
+ gdb_stdout);
+}
+
/* Mini tokenizing lexer for 'maint info sections' command. */
static int
}
static int
-match_bfd_flags (char *string, flagword flags)
+match_bfd_flags (const char *string, flagword flags)
{
if (flags & SEC_ALLOC)
if (match_substring (string, "ALLOC"))
static void
print_bfd_section_info (bfd *abfd,
asection *asect,
- void *arg)
+ void *datum)
{
flagword flags = bfd_get_section_flags (abfd, asect);
const char *name = bfd_section_name (abfd, asect);
+ const char *arg = (const char *) datum;
- if (arg == NULL || *((char *) arg) == '\0'
- || match_substring ((char *) arg, name)
- || match_bfd_flags ((char *) arg, flags))
+ if (arg == NULL || *arg == '\0'
+ || match_substring (arg, name)
+ || match_bfd_flags (arg, flags))
{
struct gdbarch *gdbarch = gdbarch_from_bfd (abfd);
int addr_size = gdbarch_addr_bit (gdbarch) / 8;
static void
print_objfile_section_info (bfd *abfd,
struct obj_section *asect,
- char *string)
+ const char *string)
{
flagword flags = bfd_get_section_flags (abfd, asect->the_bfd_section);
const char *name = bfd_section_name (abfd, asect->the_bfd_section);
gdbarch_dump (gdbarch, gdb_stdout);
else
{
- struct cleanup *cleanups;
- struct ui_file *file = gdb_fopen (args, "w");
+ stdio_file file;
- if (file == NULL)
+ if (!file.open (args, "w"))
perror_with_name (_("maintenance print architecture"));
- cleanups = make_cleanup_ui_file_delete (file);
- gdbarch_dump (gdbarch, file);
- do_cleanups (cleanups);
+ gdbarch_dump (gdbarch, &file);
}
}
if (alias)
{
if (alias->malloced_replacement)
- xfree (alias->replacement);
+ xfree ((char *) alias->replacement);
if (deprecate)
{
else if (cmd)
{
if (cmd->malloced_replacement)
- xfree (cmd->replacement);
+ xfree ((char *) cmd->replacement);
if (deprecate)
{
static int profiling_state;
+EXTERN_C void _mcleanup (void);
+
static void
mcleanup_wrapper (void)
{
- extern void _mcleanup (void);
-
if (profiling_state)
_mcleanup ();
}
+EXTERN_C void monstartup (unsigned long, unsigned long);
+extern int main ();
+
static void
maintenance_set_profile_cmd (char *args, int from_tty,
struct cmd_list_element *c)
{
static int profiling_initialized;
- extern void monstartup (unsigned long, unsigned long);
- extern int main();
-
if (!profiling_initialized)
{
atexit (mcleanup_wrapper);
static struct cmd_list_element *per_command_setlist;
static struct cmd_list_element *per_command_showlist;
-/* Records a run time and space usage to be used as a base for
- reporting elapsed time or change in space. */
-
-struct cmd_stats
-{
- /* Zero if the saved time is from the beginning of GDB execution.
- One if from the beginning of an individual command execution. */
- int msg_type;
- /* Track whether the stat was enabled at the start of the command
- so that we can avoid printing anything if it gets turned on by
- the current command. */
- int time_enabled : 1;
- int space_enabled : 1;
- int symtab_enabled : 1;
- long start_cpu_time;
- struct timeval start_wall_time;
- long start_space;
- /* Total number of symtabs (over all objfiles). */
- int start_nr_symtabs;
- /* Of those, a count of just the primary ones. */
- int start_nr_primary_symtabs;
- /* Total number of blocks. */
- int start_nr_blocks;
-};
-
/* Set whether to display time statistics to NEW_VALUE
(non-zero means true). */
/* Count the number of symtabs and blocks. */
static void
-count_symtabs_and_blocks (int *nr_symtabs_ptr, int *nr_primary_symtabs_ptr,
+count_symtabs_and_blocks (int *nr_symtabs_ptr, int *nr_compunit_symtabs_ptr,
int *nr_blocks_ptr)
{
struct objfile *o;
+ struct compunit_symtab *cu;
struct symtab *s;
int nr_symtabs = 0;
- int nr_primary_symtabs = 0;
+ int nr_compunit_symtabs = 0;
int nr_blocks = 0;
- ALL_SYMTABS (o, s)
+ /* When collecting statistics during startup, this is called before
+ pretty much anything in gdb has been initialized, and thus
+ current_program_space may be NULL. */
+ if (current_program_space != NULL)
{
- ++nr_symtabs;
- if (s->primary)
+ ALL_COMPUNITS (o, cu)
{
- ++nr_primary_symtabs;
- nr_blocks += BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (s));
+ ++nr_compunit_symtabs;
+ nr_blocks += BLOCKVECTOR_NBLOCKS (COMPUNIT_BLOCKVECTOR (cu));
+ ALL_COMPUNIT_FILETABS (cu, s)
+ ++nr_symtabs;
}
}
*nr_symtabs_ptr = nr_symtabs;
- *nr_primary_symtabs_ptr = nr_primary_symtabs;
+ *nr_compunit_symtabs_ptr = nr_compunit_symtabs;
*nr_blocks_ptr = nr_blocks;
}
-/* As indicated by display_time and display_space, report GDB's elapsed time
- and space usage from the base time and space provided in ARG, which
- must be a pointer to a struct cmd_stat. This function is intended
- to be called as a cleanup. */
+/* As indicated by display_time and display_space, report GDB's
+ elapsed time and space usage from the base time and space recorded
+ in this object. */
-static void
-report_command_stats (void *arg)
+scoped_command_stats::~scoped_command_stats ()
{
- struct cmd_stats *start_stats = (struct cmd_stats *) arg;
- int msg_type = start_stats->msg_type;
+ /* Early exit if we're not reporting any stats. It can be expensive to
+ compute the pre-command values so don't collect them at all if we're
+ not reporting stats. Alas this doesn't work in the startup case because
+ we don't know yet whether we will be reporting the stats. For the
+ startup case collect the data anyway (it should be cheap at this point),
+ and leave it to the reporter to decide whether to print them. */
+ if (m_msg_type
+ && !per_command_time
+ && !per_command_space
+ && !per_command_symtab)
+ return;
- if (start_stats->time_enabled)
+ if (m_time_enabled && per_command_time)
{
- long cmd_time = get_run_time () - start_stats->start_cpu_time;
- struct timeval now_wall_time, delta_wall_time, wait_time;
+ using namespace std::chrono;
- gettimeofday (&now_wall_time, NULL);
- timeval_sub (&delta_wall_time,
- &now_wall_time, &start_stats->start_wall_time);
+ run_time_clock::duration cmd_time
+ = run_time_clock::now () - m_start_cpu_time;
+ steady_clock::duration wall_time
+ = steady_clock::now () - m_start_wall_time;
/* Subtract time spend in prompt_for_continue from walltime. */
- wait_time = get_prompt_for_continue_wait_time ();
- timeval_sub (&delta_wall_time, &delta_wall_time, &wait_time);
-
- printf_unfiltered (msg_type == 0
- ? _("Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n")
- : _("Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"),
- cmd_time / 1000000, cmd_time % 1000000,
- (long) delta_wall_time.tv_sec,
- (long) delta_wall_time.tv_usec);
+ wall_time -= get_prompt_for_continue_wait_time ();
+
+ printf_unfiltered (!m_msg_type
+ ? _("Startup time: %.6f (cpu), %.6f (wall)\n")
+ : _("Command execution time: %.6f (cpu), %.6f (wall)\n"),
+ duration<double> (cmd_time).count (),
+ duration<double> (wall_time).count ());
}
- if (start_stats->space_enabled)
+ if (m_space_enabled && per_command_space)
{
#ifdef HAVE_SBRK
char *lim = (char *) sbrk (0);
long space_now = lim - lim_at_start;
- long space_diff = space_now - start_stats->start_space;
+ long space_diff = space_now - m_start_space;
- printf_unfiltered (msg_type == 0
+ printf_unfiltered (!m_msg_type
? _("Space used: %ld (%s%ld during startup)\n")
: _("Space used: %ld (%s%ld for this command)\n"),
space_now,
#endif
}
- if (start_stats->symtab_enabled)
+ if (m_symtab_enabled && per_command_symtab)
{
- int nr_symtabs, nr_primary_symtabs, nr_blocks;
+ int nr_symtabs, nr_compunit_symtabs, nr_blocks;
- count_symtabs_and_blocks (&nr_symtabs, &nr_primary_symtabs, &nr_blocks);
+ count_symtabs_and_blocks (&nr_symtabs, &nr_compunit_symtabs, &nr_blocks);
printf_unfiltered (_("#symtabs: %d (+%d),"
- " #primary symtabs: %d (+%d),"
+ " #compunits: %d (+%d),"
" #blocks: %d (+%d)\n"),
nr_symtabs,
- nr_symtabs - start_stats->start_nr_symtabs,
- nr_primary_symtabs,
- nr_primary_symtabs - start_stats->start_nr_primary_symtabs,
+ nr_symtabs - m_start_nr_symtabs,
+ nr_compunit_symtabs,
+ (nr_compunit_symtabs
+ - m_start_nr_compunit_symtabs),
nr_blocks,
- nr_blocks - start_stats->start_nr_blocks);
+ nr_blocks - m_start_nr_blocks);
}
}
-/* Create a cleanup that reports time and space used since its creation.
- MSG_TYPE is zero for gdb startup, otherwise it is one(1) to report
- data for individual commands. */
-
-struct cleanup *
-make_command_stats_cleanup (int msg_type)
+scoped_command_stats::scoped_command_stats (bool msg_type)
+: m_msg_type (msg_type)
{
- struct cmd_stats *new_stat;
-
- /* Early exit if we're not reporting any stats. */
- if (!per_command_time
- && !per_command_space
- && !per_command_symtab)
- return make_cleanup (null_cleanup, 0);
-
- new_stat = XCNEW (struct cmd_stats);
-
- new_stat->msg_type = msg_type;
-
- if (per_command_space)
+ if (!m_msg_type || per_command_space)
{
#ifdef HAVE_SBRK
char *lim = (char *) sbrk (0);
- new_stat->start_space = lim - lim_at_start;
- new_stat->space_enabled = 1;
+ m_start_space = lim - lim_at_start;
+ m_space_enabled = 1;
#endif
}
+ else
+ m_space_enabled = 0;
- if (per_command_time)
+ if (msg_type == 0 || per_command_time)
{
- new_stat->start_cpu_time = get_run_time ();
- gettimeofday (&new_stat->start_wall_time, NULL);
- new_stat->time_enabled = 1;
+ using namespace std::chrono;
+
+ m_start_cpu_time = run_time_clock::now ();
+ m_start_wall_time = steady_clock::now ();
+ m_time_enabled = 1;
}
+ else
+ m_time_enabled = 0;
- if (per_command_symtab)
+ if (msg_type == 0 || per_command_symtab)
{
- int nr_symtabs, nr_primary_symtabs, nr_blocks;
+ int nr_symtabs, nr_compunit_symtabs, nr_blocks;
- count_symtabs_and_blocks (&nr_symtabs, &nr_primary_symtabs, &nr_blocks);
- new_stat->start_nr_symtabs = nr_symtabs;
- new_stat->start_nr_primary_symtabs = nr_primary_symtabs;
- new_stat->start_nr_blocks = nr_blocks;
- new_stat->symtab_enabled = 1;
+ count_symtabs_and_blocks (&nr_symtabs, &nr_compunit_symtabs, &nr_blocks);
+ m_start_nr_symtabs = nr_symtabs;
+ m_start_nr_compunit_symtabs = nr_compunit_symtabs;
+ m_start_nr_blocks = nr_blocks;
+ m_symtab_enabled = 1;
}
+ else
+ m_symtab_enabled = 0;
- /* Initalize timer to keep track of how long we waited for the user. */
+ /* Initialize timer to keep track of how long we waited for the user. */
reset_prompt_for_continue_wait_time ();
-
- return make_cleanup_dtor (report_command_stats, new_stat, xfree);
}
/* Handle unknown "mt set per-command" arguments.
set_per_command_cmd (char *args, int from_tty)
{
struct cmd_list_element *list;
- size_t length;
int val;
val = parse_cli_boolean_value (args);
{
cmd_show_list (per_command_showlist, from_tty, "");
}
+\f
+
+/* The "maintenance selftest" command. */
+
+static void
+maintenance_selftest (char *args, int from_tty)
+{
+ run_self_tests ();
+}
+
\f
void
_initialize_maint_cmds (void)
{
+ struct cmd_list_element *cmd;
+
add_prefix_cmd ("maintenance", class_maintenance, maintenance_command, _("\
Commands for use by GDB maintainers.\n\
Includes commands to dump specific internal GDB structures in\n\
-a human readable form, to cause GDB to deliberately dump core,\n\
-to test internal functions such as the C++/ObjC demangler, etc."),
+a human readable form, to cause GDB to deliberately dump core, etc."),
&maintenancelist, "maintenance ", 0,
&cmdlist);
Cause GDB to behave as if a demangler warning was reported."),
&maintenancelist);
- add_cmd ("demangle", class_maintenance, maintenance_demangle, _("\
-Demangle a C++/ObjC mangled name.\n\
-Call internal GDB demangler routine to demangle a C++ link name\n\
-and prints the result."),
- &maintenancelist);
+ cmd = add_cmd ("demangle", class_maintenance, maintenance_demangle, _("\
+This command has been moved to \"demangle\"."),
+ &maintenancelist);
+ deprecate_cmd (cmd, "demangle");
add_prefix_cmd ("per-command", class_maintenance, set_per_command_cmd, _("\
Per-command statistics settings."),
Takes an optional file parameter."),
&maintenanceprintlist);
+ add_prefix_cmd ("check", class_maintenance, maintenance_check_command, _("\
+Commands for checking internal gdb state."),
+ &maintenancechecklist, "maintenance check ", 0,
+ &maintenancelist);
+
add_cmd ("translate-address", class_maintenance,
maintenance_translate_address,
_("Translate a section name and address to a symbol."),
If you decide you want to use it: maintenance undeprecate 'commandname'"),
&maintenancelist);
+ add_cmd ("selftest", class_maintenance, maintenance_selftest, _("\
+Run gdb's unit tests.\n\
+Usage: maintenance selftest\n\
+This will run any unit tests that were built in to gdb.\n\
+gdb will abort if any test fails."),
+ &maintenancelist);
+
add_setshow_zinteger_cmd ("watchdog", class_maintenance, &watchdog, _("\
Set watchdog timer."), _("\
Show watchdog timer."), _("\
projects / deliverable / binutils-gdb.git / blobdiff