X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmaint.c;h=01a80f5d732645ba03357c59cbfcf58cd9292bb1;hb=8ecfd7bd4acd69213c06fac6de9af38299123547;hp=c46bdc0bbd58035d5bdac3a7b06fbf4067345213;hpb=15c99a447efa6fcf5ba4cb2f4ccb27909bd1feb3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/maint.c b/gdb/maint.c index c46bdc0bbd..01a80f5d73 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -1,7 +1,6 @@ /* Support for GDB maintenance commands. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2004, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1992-2018 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support. @@ -22,11 +21,13 @@ #include "defs.h" +#include "arch-utils.h" #include #include #include "command.h" #include "gdbcmd.h" #include "symtab.h" +#include "block.h" #include "gdbtypes.h" #include "demangle.h" #include "gdbcore.h" @@ -35,29 +36,15 @@ #include "symfile.h" #include "objfiles.h" #include "value.h" -#include "gdb_assert.h" +#include "top.h" +#include "maint.h" +#include "selftest.h" #include "cli/cli-decode.h" +#include "cli/cli-utils.h" +#include "cli/cli-setshow.h" -extern void _initialize_maint_cmds (void); - -static void maintenance_command (char *, int); - -static void maintenance_internal_error (char *args, int from_tty); - -static void maintenance_demangle (char *, int); - -static void maintenance_time_display (char *, int); - -static void maintenance_space_display (char *, int); - -static void maintenance_info_command (char *, int); - -static void maintenance_info_sections (char *, int); - -static void maintenance_print_command (char *, int); - -static void maintenance_do_deprecate (char *, int); +static void maintenance_do_deprecate (const char *, int); /* Set this to the maximum number of seconds to wait instead of waiting forever in target_wait(). If this timer times out, then it generates an error and @@ -73,32 +60,21 @@ show_watchdog (struct ui_file *file, int from_tty, fprintf_filtered (file, _("Watchdog timer is %s.\n"), value); } -/* - - LOCAL FUNCTION - - maintenance_command -- access the maintenance subcommands - - SYNOPSIS - - void maintenance_command (char *args, int from_tty) - - DESCRIPTION - - */ +/* Access the maintenance subcommands. */ static void -maintenance_command (char *args, int from_tty) +maintenance_command (const char *args, int from_tty) { - printf_unfiltered (_("\"maintenance\" must be followed by the name of a maintenance command.\n")); - help_list (maintenancelist, "maintenance ", -1, gdb_stdout); + printf_unfiltered (_("\"maintenance\" must be followed by " + "the name of a maintenance command.\n")); + help_list (maintenancelist, "maintenance ", all_commands, gdb_stdout); } #ifndef _WIN32 static void -maintenance_dump_me (char *args, int from_tty) +maintenance_dump_me (const char *args, int from_tty) { - if (query ("Should GDB dump core? ")) + if (query (_("Should GDB dump core? "))) { #ifdef __DJGPP__ /* SIGQUIT by default is ignored, so use SIGABRT instead. */ @@ -115,10 +91,10 @@ maintenance_dump_me (char *args, int from_tty) /* Stimulate the internal error mechanism that GDB uses when an internal problem is detected. Allows testing of the mechanism. Also useful when the user wants to drop a core file but not exit - GDB. */ + GDB. */ static void -maintenance_internal_error (char *args, int from_tty) +maintenance_internal_error (const char *args, int from_tty) { internal_error (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); } @@ -126,67 +102,49 @@ maintenance_internal_error (char *args, int from_tty) /* Stimulate the internal error mechanism that GDB uses when an internal problem is detected. Allows testing of the mechanism. Also useful when the user wants to drop a core file but not exit - GDB. */ + GDB. */ static void -maintenance_internal_warning (char *args, int from_tty) +maintenance_internal_warning (const char *args, int from_tty) { internal_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) */ +/* Stimulate the internal error mechanism that GDB uses when an + demangler problem is detected. Allows testing of the mechanism. */ static void -maintenance_demangle (char *args, int from_tty) +maintenance_demangler_warning (const 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); - } - } + demangler_warning (__FILE__, __LINE__, "%s", (args == NULL ? "" : args)); } +/* 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_time_display (char *args, int from_tty) +maintenance_demangle (const char *args, int from_tty) { - extern int display_time; + printf_filtered (_("This command has been moved to \"demangle\".\n")); +} +static void +maintenance_time_display (const char *args, int from_tty) +{ if (args == NULL || *args == '\0') printf_unfiltered (_("\"maintenance time\" takes a numeric argument.\n")); else - display_time = strtol (args, NULL, 10); + set_per_command_time (strtol (args, NULL, 10)); } static void -maintenance_space_display (char *args, int from_tty) +maintenance_space_display (const char *args, int from_tty) { - extern int display_space; - if (args == NULL || *args == '\0') printf_unfiltered ("\"maintenance space\" takes a numeric argument.\n"); else - display_space = strtol (args, NULL, 10); + set_per_command_space (strtol (args, NULL, 10)); } /* The "maintenance info" command is defined as a prefix, with @@ -194,10 +152,25 @@ maintenance_space_display (char *args, int from_tty) "maintenance info" with no args. */ static void -maintenance_info_command (char *arg, int from_tty) +maintenance_info_command (const char *arg, int from_tty) { - printf_unfiltered (_("\"maintenance info\" must be followed by the name of an info command.\n")); - help_list (maintenanceinfolist, "maintenance info ", -1, gdb_stdout); + printf_unfiltered (_("\"maintenance info\" must be followed " + "by the name of an info command.\n")); + help_list (maintenanceinfolist, "maintenance info ", all_commands, + 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 (const 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. */ @@ -210,12 +183,12 @@ match_substring (const char *string, const char *substr) while ((tok = strstr (string, substr)) != NULL) { - /* Got a partial match. Is it a whole word? */ + /* Got a partial match. Is it a whole word? */ if (tok == string || tok[-1] == ' ' || tok[-1] == '\t') { - /* Token is delimited at the front... */ + /* Token is delimited at the front... */ if (tok[substr_len] == ' ' || tok[substr_len] == '\t' || tok[substr_len] == '\0') @@ -231,7 +204,7 @@ match_substring (const char *string, const char *substr) } 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")) @@ -305,11 +278,10 @@ print_bfd_flags (flagword flags) static void maint_print_section_info (const char *name, flagword flags, CORE_ADDR addr, CORE_ADDR endaddr, - unsigned long filepos) + unsigned long filepos, int addr_size) { - /* FIXME-32x64: Need paddress with field width. */ - printf_filtered (" 0x%s", paddr (addr)); - printf_filtered ("->0x%s", paddr (endaddr)); + printf_filtered (" %s", hex_string_custom (addr, addr_size)); + printf_filtered ("->%s", hex_string_custom (endaddr, addr_size)); printf_filtered (" at %s", hex_string_custom ((unsigned long) filepos, 8)); printf_filtered (": %s", name); @@ -320,27 +292,32 @@ maint_print_section_info (const char *name, flagword flags, 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; CORE_ADDR addr, endaddr; addr = bfd_section_vma (abfd, asect); endaddr = addr + bfd_section_size (abfd, asect); - maint_print_section_info (name, flags, addr, endaddr, asect->filepos); + printf_filtered (" [%d] ", gdb_bfd_section_index (abfd, asect)); + maint_print_section_info (name, flags, addr, endaddr, + asect->filepos, addr_size); } } 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); @@ -349,15 +326,19 @@ print_objfile_section_info (bfd *abfd, || match_substring (string, name) || match_bfd_flags (string, flags)) { + struct gdbarch *gdbarch = gdbarch_from_bfd (abfd); + int addr_size = gdbarch_addr_bit (gdbarch) / 8; + maint_print_section_info (name, flags, obj_section_addr (asect), obj_section_endaddr (asect), - asect->the_bfd_section->filepos); + asect->the_bfd_section->filepos, + addr_size); } } static void -maintenance_info_sections (char *arg, int from_tty) +maintenance_info_sections (const char *arg, int from_tty) { if (exec_bfd) { @@ -388,7 +369,7 @@ maintenance_info_sections (char *arg, int from_tty) } } else - bfd_map_over_sections (exec_bfd, print_bfd_section_info, arg); + bfd_map_over_sections (exec_bfd, print_bfd_section_info, (void *) arg); } if (core_bfd) @@ -397,31 +378,31 @@ maintenance_info_sections (char *arg, int from_tty) printf_filtered (" `%s', ", bfd_get_filename (core_bfd)); wrap_here (" "); printf_filtered (_("file type %s.\n"), bfd_get_target (core_bfd)); - bfd_map_over_sections (core_bfd, print_bfd_section_info, arg); + bfd_map_over_sections (core_bfd, print_bfd_section_info, (void *) arg); } } -void -maintenance_print_statistics (char *args, int from_tty) +static void +maintenance_print_statistics (const char *args, int from_tty) { print_objfile_statistics (); print_symbol_bcache_statistics (); } static void -maintenance_print_architecture (char *args, int from_tty) +maintenance_print_architecture (const char *args, int from_tty) { + struct gdbarch *gdbarch = get_current_arch (); + if (args == NULL) - gdbarch_dump (current_gdbarch, gdb_stdout); + gdbarch_dump (gdbarch, gdb_stdout); else { - struct cleanup *cleanups; - struct ui_file *file = gdb_fopen (args, "w"); - if (file == NULL) + stdio_file file; + + if (!file.open (args, "w")) perror_with_name (_("maintenance print architecture")); - cleanups = make_cleanup_ui_file_delete (file); - gdbarch_dump (current_gdbarch, file); - do_cleanups (cleanups); + gdbarch_dump (gdbarch, &file); } } @@ -430,25 +411,26 @@ maintenance_print_architecture (char *args, int from_tty) "maintenance print" with no args. */ static void -maintenance_print_command (char *arg, int from_tty) +maintenance_print_command (const char *arg, int from_tty) { - printf_unfiltered (_("\"maintenance print\" must be followed by the name of a print command.\n")); - help_list (maintenanceprintlist, "maintenance print ", -1, gdb_stdout); + printf_unfiltered (_("\"maintenance print\" must be followed " + "by the name of a print command.\n")); + help_list (maintenanceprintlist, "maintenance print ", all_commands, + gdb_stdout); } /* The "maintenance translate-address" command converts a section and address to a symbol. This can be called in two ways: maintenance translate-address - or maintenance translate-address - */ + or maintenance translate-address . */ static void -maintenance_translate_address (char *arg, int from_tty) +maintenance_translate_address (const char *arg, int from_tty) { CORE_ADDR address; struct obj_section *sect; - char *p; - struct minimal_symbol *sym; + const char *p; + struct bound_minimal_symbol sym; struct objfile *objfile; if (arg == NULL || *arg == 0) @@ -458,18 +440,18 @@ maintenance_translate_address (char *arg, int from_tty) p = arg; if (!isdigit (*p)) - { /* See if we have a valid section name */ - while (*p && !isspace (*p)) /* Find end of section name */ + { /* See if we have a valid section name. */ + while (*p && !isspace (*p)) /* Find end of section name. */ p++; - if (*p == '\000') /* End of command? */ - error (_("Need to specify and
")); - *p++ = '\000'; - while (isspace (*p)) - p++; /* Skip whitespace */ + if (*p == '\000') /* End of command? */ + error (_("Need to specify section name and address")); + + int arg_len = p - arg; + p = skip_spaces (p + 1); ALL_OBJSECTIONS (objfile, sect) { - if (strcmp (sect->the_bfd_section->name, arg) == 0) + if (strncmp (sect->the_bfd_section->name, arg, arg_len) == 0) break; } @@ -484,12 +466,13 @@ maintenance_translate_address (char *arg, int from_tty) else sym = lookup_minimal_symbol_by_pc (address); - if (sym) + if (sym.minsym) { - const char *symbol_name = SYMBOL_PRINT_NAME (sym); - const char *symbol_offset = pulongest (address - SYMBOL_VALUE_ADDRESS (sym)); + const char *symbol_name = MSYMBOL_PRINT_NAME (sym.minsym); + const char *symbol_offset + = pulongest (address - BMSYMBOL_VALUE_ADDRESS (sym)); - sect = SYMBOL_OBJ_SECTION(sym); + sect = MSYMBOL_OBJ_SECTION(sym.objfile, sym.minsym); if (sect != NULL) { const char *section_name; @@ -498,12 +481,13 @@ maintenance_translate_address (char *arg, int from_tty) gdb_assert (sect->the_bfd_section && sect->the_bfd_section->name); section_name = sect->the_bfd_section->name; - gdb_assert (sect->objfile && sect->objfile->name); - obj_name = sect->objfile->name; + gdb_assert (sect->objfile && objfile_name (sect->objfile)); + obj_name = objfile_name (sect->objfile); if (MULTI_OBJFILE_P ()) printf_filtered (_("%s + %s in section %s of %s\n"), - symbol_name, symbol_offset, section_name, obj_name); + symbol_name, symbol_offset, + section_name, obj_name); else printf_filtered (_("%s + %s in section %s\n"), symbol_name, symbol_offset, section_name); @@ -512,10 +496,10 @@ maintenance_translate_address (char *arg, int from_tty) printf_filtered (_("%s + %s\n"), symbol_name, symbol_offset); } else if (sect) - printf_filtered (_("no symbol at %s:0x%s\n"), - sect->the_bfd_section->name, paddr (address)); + printf_filtered (_("no symbol at %s:%s\n"), + sect->the_bfd_section->name, hex_string (address)); else - printf_filtered (_("no symbol at 0x%s\n"), paddr (address)); + printf_filtered (_("no symbol at %s\n"), hex_string (address)); return; } @@ -523,25 +507,24 @@ maintenance_translate_address (char *arg, int from_tty) /* When a command is deprecated the user will be warned the first time the command is used. If possible, a replacement will be - offered. */ + offered. */ static void -maintenance_deprecate (char *args, int from_tty) +maintenance_deprecate (const char *args, int from_tty) { if (args == NULL || *args == '\0') { - printf_unfiltered (_("\"maintenance deprecate\" takes an argument, \n\ -the command you want to deprecate, and optionally the replacement command \n\ + printf_unfiltered (_("\"maintenance deprecate\" takes an argument,\n\ +the command you want to deprecate, and optionally the replacement command\n\ enclosed in quotes.\n")); } maintenance_do_deprecate (args, 1); - } static void -maintenance_undeprecate (char *args, int from_tty) +maintenance_undeprecate (const char *args, int from_tty) { if (args == NULL || *args == '\0') { @@ -550,10 +533,9 @@ the command you want to undeprecate.\n")); } maintenance_do_deprecate (args, 0); - } -/* You really shouldn't be using this. It is just for the testsuite. +/* You really shouldn't be using this. It is just for the testsuite. Rather, you should use deprecate_cmd() when the command is created in _initialize_blah(). @@ -561,15 +543,14 @@ the command you want to undeprecate.\n")); replacement. */ static void -maintenance_do_deprecate (char *text, int deprecate) +maintenance_do_deprecate (const char *text, int deprecate) { - struct cmd_list_element *alias = NULL; struct cmd_list_element *prefix_cmd = NULL; struct cmd_list_element *cmd = NULL; - char *start_ptr = NULL; - char *end_ptr = NULL; + const char *start_ptr = NULL; + const char *end_ptr = NULL; int len; char *replacement = NULL; @@ -584,7 +565,7 @@ maintenance_do_deprecate (char *text, int deprecate) if (deprecate) { - /* look for a replacement command */ + /* Look for a replacement command. */ start_ptr = strchr (text, '\"'); if (start_ptr != NULL) { @@ -593,8 +574,7 @@ maintenance_do_deprecate (char *text, int deprecate) if (end_ptr != NULL) { len = end_ptr - start_ptr; - start_ptr[len] = '\0'; - replacement = xstrdup (start_ptr); + replacement = savestring (start_ptr, len); } } } @@ -607,34 +587,46 @@ maintenance_do_deprecate (char *text, int deprecate) Note the MALLOCED_REPLACEMENT test. If the command's replacement string was allocated at compile time we don't want to free the - memory. */ + memory. */ if (alias) { - - if (alias->flags & MALLOCED_REPLACEMENT) - xfree (alias->replacement); + if (alias->malloced_replacement) + xfree ((char *) alias->replacement); if (deprecate) - alias->flags |= (DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + alias->deprecated_warn_user = 1; + alias->cmd_deprecated = 1; + } else - alias->flags &= ~(DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + alias->deprecated_warn_user = 0; + alias->cmd_deprecated = 0; + } alias->replacement = replacement; - alias->flags |= MALLOCED_REPLACEMENT; + alias->malloced_replacement = 1; return; } else if (cmd) { - if (cmd->flags & MALLOCED_REPLACEMENT) - xfree (cmd->replacement); + if (cmd->malloced_replacement) + xfree ((char *) cmd->replacement); if (deprecate) - cmd->flags |= (DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + cmd->deprecated_warn_user = 1; + cmd->cmd_deprecated = 1; + } else - cmd->flags &= ~(DEPRECATED_WARN_USER | CMD_DEPRECATED); + { + cmd->deprecated_warn_user = 0; + cmd->cmd_deprecated = 0; + } cmd->replacement = replacement; - cmd->flags |= MALLOCED_REPLACEMENT; + cmd->malloced_replacement = 1; return; } + xfree (replacement); } /* Maintenance set/show framework. */ @@ -643,14 +635,16 @@ struct cmd_list_element *maintenance_set_cmdlist; struct cmd_list_element *maintenance_show_cmdlist; static void -maintenance_set_cmd (char *args, int from_tty) +maintenance_set_cmd (const char *args, int from_tty) { - printf_unfiltered (_("\"maintenance set\" must be followed by the name of a set command.\n")); - help_list (maintenance_set_cmdlist, "maintenance set ", -1, gdb_stdout); + printf_unfiltered (_("\"maintenance set\" must be followed " + "by the name of a set command.\n")); + help_list (maintenance_set_cmdlist, "maintenance set ", all_commands, + gdb_stdout); } static void -maintenance_show_cmd (char *args, int from_tty) +maintenance_show_cmd (const char *args, int from_tty) { cmd_show_list (maintenance_show_cmdlist, from_tty, ""); } @@ -677,17 +671,21 @@ extern char etext; 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) +maintenance_set_profile_cmd (const char *args, int from_tty, + struct cmd_list_element *c) { if (maintenance_profile_p == profiling_state) return; @@ -698,9 +696,6 @@ maintenance_set_profile_cmd (char *args, int from_tty, struct cmd_list_element * { static int profiling_initialized; - extern void monstartup (unsigned long, unsigned long); - extern int main(); - if (!profiling_initialized) { atexit (mcleanup_wrapper); @@ -714,27 +709,268 @@ maintenance_set_profile_cmd (char *args, int from_tty, struct cmd_list_element * else { extern void _mcleanup (void); + _mcleanup (); } } #else static void -maintenance_set_profile_cmd (char *args, int from_tty, struct cmd_list_element *c) +maintenance_set_profile_cmd (const char *args, int from_tty, + struct cmd_list_element *c) { error (_("Profiling support is not available on this system.")); } #endif + +/* If nonzero, display time usage both at startup and for each command. */ + +static int per_command_time; + +/* If nonzero, display space usage both at startup and for each command. */ + +static int per_command_space; + +/* If nonzero, display basic symtab stats for each command. */ + +static int per_command_symtab; + +/* mt per-command commands. */ + +static struct cmd_list_element *per_command_setlist; +static struct cmd_list_element *per_command_showlist; + +/* Set whether to display time statistics to NEW_VALUE + (non-zero means true). */ + +void +set_per_command_time (int new_value) +{ + per_command_time = new_value; +} + +/* Set whether to display space statistics to NEW_VALUE + (non-zero means true). */ +void +set_per_command_space (int new_value) +{ + per_command_space = new_value; +} + +/* Count the number of symtabs and blocks. */ + +static void +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_compunit_symtabs = 0; + int nr_blocks = 0; + + /* 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) + { + ALL_COMPUNITS (o, cu) + { + ++nr_compunit_symtabs; + nr_blocks += BLOCKVECTOR_NBLOCKS (COMPUNIT_BLOCKVECTOR (cu)); + ALL_COMPUNIT_FILETABS (cu, s) + ++nr_symtabs; + } + } + + *nr_symtabs_ptr = nr_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 recorded + in this object. */ + +scoped_command_stats::~scoped_command_stats () +{ + /* 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 (m_time_enabled && per_command_time) + { + using namespace std::chrono; + + 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. */ + 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 (cmd_time).count (), + duration (wall_time).count ()); + } + + if (m_space_enabled && per_command_space) + { +#ifdef HAVE_USEFUL_SBRK + char *lim = (char *) sbrk (0); + + long space_now = lim - lim_at_start; + long space_diff = space_now - m_start_space; + + printf_unfiltered (!m_msg_type + ? _("Space used: %ld (%s%ld during startup)\n") + : _("Space used: %ld (%s%ld for this command)\n"), + space_now, + (space_diff >= 0 ? "+" : ""), + space_diff); +#endif + } + + if (m_symtab_enabled && per_command_symtab) + { + int nr_symtabs, nr_compunit_symtabs, nr_blocks; + + count_symtabs_and_blocks (&nr_symtabs, &nr_compunit_symtabs, &nr_blocks); + printf_unfiltered (_("#symtabs: %d (+%d)," + " #compunits: %d (+%d)," + " #blocks: %d (+%d)\n"), + nr_symtabs, + nr_symtabs - m_start_nr_symtabs, + nr_compunit_symtabs, + (nr_compunit_symtabs + - m_start_nr_compunit_symtabs), + nr_blocks, + nr_blocks - m_start_nr_blocks); + } +} + +scoped_command_stats::scoped_command_stats (bool msg_type) +: m_msg_type (msg_type) +{ + if (!m_msg_type || per_command_space) + { +#ifdef HAVE_USEFUL_SBRK + char *lim = (char *) sbrk (0); + m_start_space = lim - lim_at_start; + m_space_enabled = 1; +#endif + } + else + m_space_enabled = 0; + + if (msg_type == 0 || per_command_time) + { + 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 (msg_type == 0 || per_command_symtab) + { + int nr_symtabs, nr_compunit_symtabs, nr_blocks; + + 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; + + /* Initialize timer to keep track of how long we waited for the user. */ + reset_prompt_for_continue_wait_time (); +} + +/* Handle unknown "mt set per-command" arguments. + In this case have "mt set per-command on|off" affect every setting. */ + +static void +set_per_command_cmd (const char *args, int from_tty) +{ + struct cmd_list_element *list; + int val; + + val = parse_cli_boolean_value (args); + if (val < 0) + error (_("Bad value for 'mt set per-command no'.")); + + for (list = per_command_setlist; list != NULL; list = list->next) + if (list->var_type == var_boolean) + { + gdb_assert (list->type == set_cmd); + do_set_command (args, from_tty, list); + } +} + +/* Command "show per-command" displays summary of all the current + "show per-command " settings. */ + +static void +show_per_command_cmd (const char *args, int from_tty) +{ + cmd_show_list (per_command_showlist, from_tty, ""); +} + + +/* The "maintenance selftest" command. */ + +static void +maintenance_selftest (const char *args, int from_tty) +{ +#if GDB_SELF_TEST + selftests::run_tests (args); +#else + printf_filtered (_("\ +Selftests have been disabled for this build.\n")); +#endif +} + +static void +maintenance_info_selftests (const char *arg, int from_tty) +{ +#if GDB_SELF_TEST + printf_filtered ("Registered selftests:\n"); + selftests::for_each_selftest ([] (const std::string &name) { + printf_filtered (" - %s\n", name.c_str ()); + }); +#else + printf_filtered (_("\ +Selftests have been disabled for this build.\n")); +#endif +} + + void _initialize_maint_cmds (void) { - struct cmd_list_element *tmpcmd; + 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); @@ -797,18 +1033,67 @@ Give GDB an internal warning.\n\ Cause GDB to behave as if an internal 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."), + add_cmd ("demangler-warning", class_maintenance, + maintenance_demangler_warning, _("\ +Give GDB a demangler warning.\n\ +Cause GDB to behave as if a demangler warning was reported."), &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."), + &per_command_setlist, "maintenance set per-command ", + 1/*allow-unknown*/, &maintenance_set_cmdlist); + + add_prefix_cmd ("per-command", class_maintenance, show_per_command_cmd, _("\ +Show per-command statistics settings."), + &per_command_showlist, "maintenance show per-command ", + 0/*allow-unknown*/, &maintenance_show_cmdlist); + + add_setshow_boolean_cmd ("time", class_maintenance, + &per_command_time, _("\ +Set whether to display per-command execution time."), _("\ +Show whether to display per-command execution time."), + _("\ +If enabled, the execution time for each command will be\n\ +displayed following the command's output."), + NULL, NULL, + &per_command_setlist, &per_command_showlist); + + add_setshow_boolean_cmd ("space", class_maintenance, + &per_command_space, _("\ +Set whether to display per-command space usage."), _("\ +Show whether to display per-command space usage."), + _("\ +If enabled, the space usage for each command will be\n\ +displayed following the command's output."), + NULL, NULL, + &per_command_setlist, &per_command_showlist); + + add_setshow_boolean_cmd ("symtab", class_maintenance, + &per_command_symtab, _("\ +Set whether to display per-command symtab statistics."), _("\ +Show whether to display per-command symtab statistics."), + _("\ +If enabled, the basic symtab statistics for each command will be\n\ +displayed following the command's output."), + NULL, NULL, + &per_command_setlist, &per_command_showlist); + + /* This is equivalent to "mt set per-command time on". + Kept because some people are used to typing "mt time 1". */ add_cmd ("time", class_maintenance, maintenance_time_display, _("\ Set the display of time usage.\n\ If nonzero, will cause the execution time for each command to be\n\ displayed, following the command's output."), &maintenancelist); + /* This is equivalent to "mt set per-command space on". + Kept because some people are used to typing "mt space 1". */ add_cmd ("space", class_maintenance, maintenance_space_display, _("\ Set the display of space usage.\n\ If nonzero, will cause the execution space for each command to be\n\ @@ -821,41 +1106,6 @@ For each node in a type chain, print the raw data for each member of\n\ the type structure, and the interpretation of the data."), &maintenanceprintlist); - add_cmd ("symbols", class_maintenance, maintenance_print_symbols, _("\ -Print dump of current symbol definitions.\n\ -Entries in the full symbol table are dumped to file OUTFILE.\n\ -If a SOURCE file is specified, dump only that file's symbols."), - &maintenanceprintlist); - - add_cmd ("msymbols", class_maintenance, maintenance_print_msymbols, _("\ -Print dump of current minimal symbol definitions.\n\ -Entries in the minimal symbol table are dumped to file OUTFILE.\n\ -If a SOURCE file is specified, dump only that file's minimal symbols."), - &maintenanceprintlist); - - add_cmd ("psymbols", class_maintenance, maintenance_print_psymbols, _("\ -Print dump of current partial symbol definitions.\n\ -Entries in the partial symbol table are dumped to file OUTFILE.\n\ -If a SOURCE file is specified, dump only that file's partial symbols."), - &maintenanceprintlist); - - add_cmd ("objfiles", class_maintenance, maintenance_print_objfiles, - _("Print dump of current object file definitions."), - &maintenanceprintlist); - - add_cmd ("symtabs", class_maintenance, maintenance_info_symtabs, _("\ -List the full symbol tables for all object files.\n\ -This does not include information about individual symbols, blocks, or\n\ -linetables --- just the symbol table structures themselves.\n\ -With an argument REGEXP, list the symbol tables whose names that match that."), - &maintenanceinfolist); - - add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs, _("\ -List the partial symbol tables for all object files.\n\ -This does not include information about individual partial symbols,\n\ -just the symbol table structures themselves."), - &maintenanceinfolist); - add_cmd ("statistics", class_maintenance, maintenance_print_statistics, _("Print statistics about internal gdb state."), &maintenanceprintlist); @@ -866,11 +1116,13 @@ Print the internal architecture configuration.\n\ Takes an optional file parameter."), &maintenanceprintlist); - add_cmd ("check-symtabs", class_maintenance, maintenance_check_symtabs, - _("Check consistency of psymtabs and symtabs."), - &maintenancelist); + 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, + add_cmd ("translate-address", class_maintenance, + maintenance_translate_address, _("Translate a section name and address to a symbol."), &maintenancelist); @@ -887,6 +1139,16 @@ testsuite can check the command deprecator. You probably shouldn't use this,\n\ 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 [filter]\n\ +This will run any unit tests that were built in to gdb.\n\ +If a filter is given, only the tests with that value in their name will ran."), + &maintenancelist); + + add_cmd ("selftests", class_maintenance, maintenance_info_selftests, + _("List the registered selftests."), &maintenanceinfolist); + add_setshow_zinteger_cmd ("watchdog", class_maintenance, &watchdog, _("\ Set watchdog timer."), _("\ Show watchdog timer."), _("\