binutils-gdb/gdb/dwarf-index-cache.c
Philippe Waroquiers 590042fc45 Make first and last lines of 'command help documentation' consistent.
With this patch, the help docs now respect 2 invariants:
  * The first line of a command help is terminated by a '.' character.
  * The last character of a command help is not a newline character.

Note that the changes for the last invariant were done by Tom, as part of :
 [PATCH] Remove trailing newlines from help text
 https://sourceware.org/ml/gdb-patches/2019-06/msg00050.html
but some occurrences have been re-introduced since then.

Some help docs had to be rephrased/restructured to respect the above
invariants.

Before this patch, print_doc_line was printing the first line
of a command help documentation, but stopping at the first '.'
or ',' character.

This was giving inconsistent results :
  * The first line of command helps was sometimes '.' terminated,
    sometimes not.
  * The first line of command helps was not always designed to be
    readable/understandable/unambiguous when stopping at the first
    '.' or ',' character.

This e.g. created the following inconsistencies/problems:
< catch exception -- Catch Ada exceptions
< catch handlers -- Catch Ada exceptions
< catch syscall -- Catch system calls by their names
< down-silently -- Same as the `down' command
while the new help is:
> catch exception -- Catch Ada exceptions, when raised.
> catch handlers -- Catch Ada exceptions, when handled.
> catch syscall -- Catch system calls by their names, groups and/or numbers.
> down-silently -- Same as the `down' command, but does not print anything.

Also, the command help doc should not be terminated by a newline
character, but this was not respected by all commands.
The cli-option -OPT framework re-introduced some occurences.
So, the -OPT build help framework was changed to not output newlines at the
end of %OPTIONS% replacement.

This patch changes the help documentations to ensure the 2 invariants
given above.

It implied to slightly rephrase or restructure some help docs.

Based on the above invariants, print_doc_line (called by
'apropos' and 'help' commands to print the first line of a command
help) now outputs the full first line of a command help.

This all results in a lot of small changes in the produced help docs.
There are less code changes than changes in the help docs, as a lot
of docs are produced by some code (e.g. the remote packet usage settings).

gdb/ChangeLog
2019-08-07  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* cli/cli-decode.h (print_doc_line): Add for_value_prefix argument.
	* cli/cli-decode.c (print_doc_line): Likewise.  It now prints
	the full first line, except when FOR_VALUE_PREFIX.  In this case,
	the trailing '.' is not output, and the first character is uppercased.
	(print_help_for_command): Update call to print_doc_line.
	(print_doc_of_command): Likewise.
	* cli/cli-setshow.c (deprecated_show_value_hack): Likewise.
	* cli/cli-option.c (append_indented_doc): Do not append newline.
	(build_help_option): Append newline after first appended_indented_doc
	only if a second call is done.
	(build_help): Append 2 new lines before each option, except the first
	one.
	* compile/compile.c (_initialize_compile): Add new lines after
	%OPTIONS%, when not at the end of the help.
	Change help doc or code
	producing the help doc to respect the invariants.
	* maint-test-options.c (_initialize_maint_test_options): Likewise.
	Also removed the new line after 'Options:', as all other commands
	do not put an empty line between 'Options:' and the first option.
	* printcmd.c (_initialize_printcmd): Likewise.
	* stack.c (_initialize_stack): Likewise.
	* interps.c (interpreter_exec_cmd): Fix "Usage:" line that was
	incorrectly telling COMMAND is optional.
	* ada-lang.c (_initialize_ada_language): Change help doc or code
	producing the help doc to respect the invariants.
	* ada-tasks.c (_initialize_ada_tasks): Likewise.
	* breakpoint.c (_initialize_breakpoint): Likewise.
	* cli/cli-cmds.c (_initialize_cli_cmds): Likewise.
	* cli/cli-logging.c (_initialize_cli_logging): Likewise.
	* cli/cli-setshow.c (_initialize_cli_setshow): Likewise.
	* cli/cli-style.c (cli_style_option::add_setshow_commands,
	_initialize_cli_style): Likewise.
	* corelow.c (core_target_info): Likewise.
	* dwarf-index-cache.c (_initialize_index_cache): Likewise.
	* dwarf2read.c (_initialize_dwarf2_read): Likewise.
	* filesystem.c (_initialize_filesystem): Likewise.
	* frame.c (_initialize_frame): Likewise.
	* gnu-nat.c (add_task_commands): Likewise.
	* infcall.c (_initialize_infcall): Likewise.
	* infcmd.c (_initialize_infcmd): Likewise.
	* interps.c (_initialize_interpreter): Likewise.
	* language.c (_initialize_language): Likewise.
	* linux-fork.c (_initialize_linux_fork): Likewise.
	* maint-test-settings.c (_initialize_maint_test_settings): Likewise.
	* maint.c (_initialize_maint_cmds): Likewise.
	* memattr.c (_initialize_mem): Likewise.
	* printcmd.c (_initialize_printcmd): Likewise.
	* python/lib/gdb/function/strfns.py (_MemEq, _StrLen, _StrEq,
	_RegEx): Likewise.
	* ravenscar-thread.c (_initialize_ravenscar): Likewise.
	* record-btrace.c (_initialize_record_btrace): Likewise.
	* record-full.c (_initialize_record_full): Likewise.
	* record.c (_initialize_record): Likewise.
	* regcache-dump.c (_initialize_regcache_dump): Likewise.
	* regcache.c (_initialize_regcache): Likewise.
	* remote.c (add_packet_config_cmd, init_remote_threadtests,
	_initialize_remote): Likewise.
	* ser-tcp.c (_initialize_ser_tcp): Likewise.
	* serial.c (_initialize_serial): Likewise.
	* skip.c (_initialize_step_skip): Likewise.
	* source.c (_initialize_source): Likewise.
	* stack.c (_initialize_stack): Likewise.
	* symfile.c (_initialize_symfile): Likewise.
	* symtab.c (_initialize_symtab): Likewise.
	* target-descriptions.c (_initialize_target_descriptions): Likewise.
	* top.c (init_main): Likewise.
	* tracefile-tfile.c (tfile_target_info): Likewise.
	* tracepoint.c (_initialize_tracepoint): Likewise.
	* tui/tui-win.c (_initialize_tui_win): Likewise.
	* utils.c (add_internal_problem_command): Likewise.
	* valprint.c (value_print_option_defs): Likewise.

gdb/testsuite/ChangeLog
2019-08-07  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdb.base/style.exp: Update tests for help doc new invariants.
	* gdb.base/help.exp: Likewise.
2019-08-07 00:04:33 +02:00

383 lines
10 KiB
C

/* Caching of GDB/DWARF index files.
Copyright (C) 1994-2019 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 "dwarf-index-cache.h"
#include "build-id.h"
#include "cli/cli-cmds.h"
#include "command.h"
#include "gdbsupport/scoped_mmap.h"
#include "gdbsupport/pathstuff.h"
#include "dwarf-index-write.h"
#include "dwarf2read.h"
#include "objfiles.h"
#include "gdbsupport/selftest.h"
#include <string>
#include <stdlib.h>
/* When set to 1, show debug messages about the index cache. */
static int debug_index_cache = 0;
/* The index cache directory, used for "set/show index-cache directory". */
static char *index_cache_directory = NULL;
/* See dwarf-index.cache.h. */
index_cache global_index_cache;
/* set/show index-cache commands. */
static cmd_list_element *set_index_cache_prefix_list;
static cmd_list_element *show_index_cache_prefix_list;
/* Default destructor of index_cache_resource. */
index_cache_resource::~index_cache_resource () = default;
/* See dwarf-index-cache.h. */
void
index_cache::set_directory (std::string dir)
{
gdb_assert (!dir.empty ());
m_dir = std::move (dir);
if (debug_index_cache)
printf_unfiltered ("index cache: now using directory %s\n", m_dir.c_str ());
}
/* See dwarf-index-cache.h. */
void
index_cache::enable ()
{
if (debug_index_cache)
printf_unfiltered ("index cache: enabling (%s)\n", m_dir.c_str ());
m_enabled = true;
}
/* See dwarf-index-cache.h. */
void
index_cache::disable ()
{
if (debug_index_cache)
printf_unfiltered ("index cache: disabling\n");
m_enabled = false;
}
/* See dwarf-index-cache.h. */
void
index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
{
objfile *obj = dwarf2_per_objfile->objfile;
if (!enabled ())
return;
/* Get build id of objfile. */
const bfd_build_id *build_id = build_id_bfd_get (obj->obfd);
if (build_id == nullptr)
{
if (debug_index_cache)
printf_unfiltered ("index cache: objfile %s has no build id\n",
objfile_name (obj));
return;
}
std::string build_id_str = build_id_to_string (build_id);
/* Get build id of dwz file, if present. */
gdb::optional<std::string> dwz_build_id_str;
const dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile);
const char *dwz_build_id_ptr = NULL;
if (dwz != nullptr)
{
const bfd_build_id *dwz_build_id = build_id_bfd_get (dwz->dwz_bfd.get ());
if (dwz_build_id == nullptr)
{
if (debug_index_cache)
printf_unfiltered ("index cache: dwz objfile %s has no build id\n",
dwz->filename ());
return;
}
dwz_build_id_str = build_id_to_string (dwz_build_id);
dwz_build_id_ptr = dwz_build_id_str->c_str ();
}
if (m_dir.empty ())
{
warning (_("The index cache directory name is empty, skipping store."));
return;
}
try
{
/* Try to create the containing directory. */
if (!mkdir_recursive (m_dir.c_str ()))
{
warning (_("index cache: could not make cache directory: %s"),
safe_strerror (errno));
return;
}
if (debug_index_cache)
printf_unfiltered ("index cache: writing index cache for objfile %s\n",
objfile_name (obj));
/* Write the index itself to the directory, using the build id as the
filename. */
write_psymtabs_to_index (dwarf2_per_objfile, m_dir.c_str (),
build_id_str.c_str (), dwz_build_id_ptr,
dw_index_kind::GDB_INDEX);
}
catch (const gdb_exception_error &except)
{
if (debug_index_cache)
printf_unfiltered ("index cache: couldn't store index cache for objfile "
"%s: %s", objfile_name (obj), except.what ());
}
}
#if HAVE_SYS_MMAN_H
/* Hold the resources for an mmapped index file. */
struct index_cache_resource_mmap final : public index_cache_resource
{
/* Try to mmap FILENAME. Throw an exception on failure, including if the
file doesn't exist. */
index_cache_resource_mmap (const char *filename)
: mapping (mmap_file (filename))
{}
scoped_mmap mapping;
};
/* See dwarf-index-cache.h. */
gdb::array_view<const gdb_byte>
index_cache::lookup_gdb_index (const bfd_build_id *build_id,
std::unique_ptr<index_cache_resource> *resource)
{
if (!enabled ())
return {};
if (m_dir.empty ())
{
warning (_("The index cache directory name is empty, skipping cache "
"lookup."));
return {};
}
/* Compute where we would expect a gdb index file for this build id to be. */
std::string filename = make_index_filename (build_id, INDEX4_SUFFIX);
try
{
if (debug_index_cache)
printf_unfiltered ("index cache: trying to read %s\n",
filename.c_str ());
/* Try to map that file. */
index_cache_resource_mmap *mmap_resource
= new index_cache_resource_mmap (filename.c_str ());
/* Yay, it worked! Hand the resource to the caller. */
resource->reset (mmap_resource);
return gdb::array_view<const gdb_byte>
((const gdb_byte *) mmap_resource->mapping.get (),
mmap_resource->mapping.size ());
}
catch (const gdb_exception_error &except)
{
if (debug_index_cache)
printf_unfiltered ("index cache: couldn't read %s: %s\n",
filename.c_str (), except.what ());
}
return {};
}
#else /* !HAVE_SYS_MMAN_H */
/* See dwarf-index-cache.h. This is a no-op on unsupported systems. */
gdb::array_view<const gdb_byte>
index_cache::lookup_gdb_index (const bfd_build_id *build_id,
std::unique_ptr<index_cache_resource> *resource)
{
return {};
}
#endif
/* See dwarf-index-cache.h. */
std::string
index_cache::make_index_filename (const bfd_build_id *build_id,
const char *suffix) const
{
std::string build_id_str = build_id_to_string (build_id);
return m_dir + SLASH_STRING + build_id_str + suffix;
}
/* "set index-cache" handler. */
static void
set_index_cache_command (const char *arg, int from_tty)
{
printf_unfiltered (_("\
Missing arguments. See \"help set index-cache\" for help.\n"));
}
/* True when we are executing "show index-cache". This is used to improve the
printout a little bit. */
static bool in_show_index_cache_command = false;
/* "show index-cache" handler. */
static void
show_index_cache_command (const char *arg, int from_tty)
{
/* Note that we are executing "show index-cache". */
auto restore_flag = make_scoped_restore (&in_show_index_cache_command, true);
/* Call all "show index-cache" subcommands. */
cmd_show_list (show_index_cache_prefix_list, from_tty, "");
printf_unfiltered ("\n");
printf_unfiltered
(_("The index cache is currently %s.\n"),
global_index_cache.enabled () ? _("enabled") : _("disabled"));
}
/* "set index-cache on" handler. */
static void
set_index_cache_on_command (const char *arg, int from_tty)
{
global_index_cache.enable ();
}
/* "set index-cache off" handler. */
static void
set_index_cache_off_command (const char *arg, int from_tty)
{
global_index_cache.disable ();
}
/* "set index-cache directory" handler. */
static void
set_index_cache_directory_command (const char *arg, int from_tty,
cmd_list_element *element)
{
/* Make sure the index cache directory is absolute and tilde-expanded. */
gdb::unique_xmalloc_ptr<char> abs (gdb_abspath (index_cache_directory));
xfree (index_cache_directory);
index_cache_directory = abs.release ();
global_index_cache.set_directory (index_cache_directory);
}
/* "show index-cache stats" handler. */
static void
show_index_cache_stats_command (const char *arg, int from_tty)
{
const char *indent = "";
/* If this command is invoked through "show index-cache", make the display a
bit nicer. */
if (in_show_index_cache_command)
{
indent = " ";
printf_unfiltered ("\n");
}
printf_unfiltered (_("%s Cache hits (this session): %u\n"),
indent, global_index_cache.n_hits ());
printf_unfiltered (_("%sCache misses (this session): %u\n"),
indent, global_index_cache.n_misses ());
}
void
_initialize_index_cache ()
{
/* Set the default index cache directory. */
std::string cache_dir = get_standard_cache_dir ();
if (!cache_dir.empty ())
{
index_cache_directory = xstrdup (cache_dir.c_str ());
global_index_cache.set_directory (std::move (cache_dir));
}
else
warning (_("Couldn't determine a path for the index cache directory."));
/* set index-cache */
add_prefix_cmd ("index-cache", class_files, set_index_cache_command,
_("Set index-cache options."), &set_index_cache_prefix_list,
"set index-cache ", false, &setlist);
/* show index-cache */
add_prefix_cmd ("index-cache", class_files, show_index_cache_command,
_("Show index-cache options."), &show_index_cache_prefix_list,
"show index-cache ", false, &showlist);
/* set index-cache on */
add_cmd ("on", class_files, set_index_cache_on_command,
_("Enable the index cache."), &set_index_cache_prefix_list);
/* set index-cache off */
add_cmd ("off", class_files, set_index_cache_off_command,
_("Disable the index cache."), &set_index_cache_prefix_list);
/* set index-cache directory */
add_setshow_filename_cmd ("directory", class_files, &index_cache_directory,
_("Set the directory of the index cache."),
_("Show the directory of the index cache."),
NULL,
set_index_cache_directory_command, NULL,
&set_index_cache_prefix_list,
&show_index_cache_prefix_list);
/* show index-cache stats */
add_cmd ("stats", class_files, show_index_cache_stats_command,
_("Show some stats about the index cache."),
&show_index_cache_prefix_list);
/* set debug index-cache */
add_setshow_boolean_cmd ("index-cache", class_maintenance,
&debug_index_cache,
_("Set display of index-cache debug messages."),
_("Show display of index-cache debug messages."),
_("\
When non-zero, debugging output for the index cache is displayed."),
NULL, NULL,
&setdebuglist, &showdebuglist);
}