mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
c497330687
PR 24445 ("dwz multifile index not written to index cache") exposed the fact that we are not doing things right when we generate an index for an object file that has is linked to a dwz file. The same happens whether the index is generated with the intent of populating the index cache or using the save gdb-index command. The problem can be observed when running these tests with the cc-with-dwz-m board: FAIL: gdb.base/index-cache.exp: test_cache_enabled_hit: check index-cache stats FAIL: gdb.dwarf2/gdb-index.exp: index used FAIL: gdb.dwarf2/gdb-index.exp: index used after symbol reloading When generating the index for such file and inspecting the CU list of the resulting index (with readelf --debug-dump=gdb_index), we can see something like: CU table: [ 0] 0x0 - 0xb9 [ 1] 0x0 - 0x44 This is supposed to be a sorted list of the ranges of all CUs in the file this index represents, so already having some overlap is a red flag. It turns out that we save the ranges of CUs coming from both the main file and the dwz file in the same index. After digging a little bit, it became quite obvious that the index in the main file should only list the CUs present in the main file, and a separate index should be generated for the dwz file, listing the CUs present in that file. First, that's what happens if you run dwz on a file that already has a GDB index embedded. Second, dwarf2read.c has code to read an index from a dwz file. The index in the dwz file is actually required to be present, if the main file has an index. So this patch changes write_psymtabs_to_index to generate an index for the dwz file, if present. That index only contains a CU list, just like what the dwz tool does when processing a file that already contains an index. Some notes about the implementation: - The file management (creating a temp file, make sure it's close/removed on error - in the right order) is a bit heavy in write_psymtabs_to_index, and I needed to add a third file. I factored this pattern in a separate class, index_wip_file. - It became a bit tedious to keep the call to assert_file_size in write_psymtabs_to_index, write_gdbindex would have had to return two sizes. Instead, I moved the calls to assert_file_size where the file is written. The downside is that we lose the filename at this point, but it was only used for the very improbable case of ftell failing, so I think it's not a problem. - The actual writing of the index file is factored out to write_gdbindex_1, so it can be re-used for both index files. - While the "save gdb-index" command will now write two .gdb-index files, this patch does not update the gdb-add-index.sh script, this will come in a later patch. gdb/ChangeLog: YYYY-MM-DD Simon Marchi <simon.marchi@efficios.com> PR gdb/24445 * dwarf-index-write.h (write_psymtabs_to_index): Add dwz_basename parameter. * dwarf-index-write.c (write_gdbindex): Move file writing to write_gdbindex_1. Change return type void. (assert_file_size): Move up, remove filename parameter. (write_gdbindex_1): New function. (write_debug_names): Change return type to void, call assert_file_size. (struct index_wip_file): New struct. (write_psymtabs_to_index): Add dwz_basename parameter. Move file logic to index_wip_file. Write index for dwz file if needed. (save_gdb_index_command): Pass basename of dwz file, if present. * dwarf-index-cache.c (index_cache::store): Obtain and pass build-id of dwz file, if present. * dwarf2read.c (struct dwz_file): Move to dwarf2read.h. (dwarf2_get_dwz_file): Likewise. * dwarf2read.h (struct dwz_file): Move from dwarf2read.c. (dwarf2_get_dwz_file): Likewise. gdb/testsuite/ChangeLog: YYYY-MM-DD Tom de Vries <tdevries@suse.de> PR gdb/24445 * gdb.dwarf2/gdb-index.exp (add_gdb_index): Update dwz file with generated index.
383 lines
10 KiB
C
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 "common/scoped_mmap.h"
|
|
#include "common/pathstuff.h"
|
|
#include "dwarf-index-write.h"
|
|
#include "dwarf2read.h"
|
|
#include "objfiles.h"
|
|
#include "common/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);
|
|
}
|