public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Add "fullname" handling to file_and_directory
@ 2022-04-12 15:40 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-04-12 15:40 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c600d77cb77d6eafc15ff6b1bb34c765e3b21bcc
commit c600d77cb77d6eafc15ff6b1bb34c765e3b21bcc
Author: Tom Tromey <tom@tromey.com>
Date: Mon Nov 29 17:56:56 2021 -0700
Add "fullname" handling to file_and_directory
This changes the file_and_directory object to be able to compute and
cache the "fullname" in the same way that is done by other code, like
the psymtab reader.
Diff:
---
gdb/dwarf2/file-and-dir.h | 18 ++++++++++++++++++
gdb/dwarf2/read.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/gdb/dwarf2/file-and-dir.h b/gdb/dwarf2/file-and-dir.h
index a392636830d..1113fe09623 100644
--- a/gdb/dwarf2/file-and-dir.h
+++ b/gdb/dwarf2/file-and-dir.h
@@ -28,6 +28,7 @@
#define GDB_DWARF2_FILE_AND_DIR_H
#include "objfiles.h"
+#include "source.h"
#include <string>
/* The return type of find_file_and_directory. Note, the enclosed
@@ -90,6 +91,20 @@ struct file_and_directory
m_name = m_name_storage.get ();
}
+ /* Return the full name, computing it if necessary. */
+ const char *get_fullname ()
+ {
+ if (m_fullname == nullptr)
+ m_fullname = find_source_or_rewrite (get_name (), get_comp_dir ());
+ return m_fullname.get ();
+ }
+
+ /* Forget the full name. */
+ void forget_fullname ()
+ {
+ m_fullname.reset ();
+ }
+
private:
/* The filename. */
@@ -106,6 +121,9 @@ private:
/* The compilation directory, if it needed to be allocated. */
std::string m_comp_dir_storage;
+
+ /* The full name. */
+ gdb::unique_xmalloc_ptr<char> m_fullname;
};
#endif /* GDB_DWARF2_FILE_AND_DIR_H */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index a986d9a2ab2..29e1f098d27 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -3139,6 +3139,9 @@ dwarf2_base_index_functions::find_last_source_symtab (struct objfile *objfile)
void
dwarf2_per_cu_data::free_cached_file_names ()
{
+ if (fnd != nullptr)
+ fnd->forget_fullname ();
+
if (per_bfd == nullptr || !per_bfd->using_index || v.quick == nullptr)
return;
@@ -4362,6 +4365,27 @@ dw_expand_symtabs_matching_file_matcher
if (per_objfile->symtab_set_p (per_cu.get ()))
continue;
+ if (per_cu->fnd != nullptr)
+ {
+ file_and_directory *fnd = per_cu->fnd.get ();
+
+ if (file_matcher (fnd->get_name (), false))
+ {
+ per_cu->v.quick->mark = 1;
+ continue;
+ }
+
+ /* Before we invoke realpath, which can get expensive when many
+ files are involved, do a quick comparison of the basenames. */
+ if ((basenames_may_differ
+ || file_matcher (lbasename (fnd->get_name ()), true))
+ && file_matcher (fnd->get_fullname (), false))
+ {
+ per_cu->v.quick->mark = 1;
+ continue;
+ }
+ }
+
quick_file_names *file_data = dw2_get_file_names (per_cu.get (),
per_objfile);
if (file_data == NULL)
@@ -4556,6 +4580,24 @@ dwarf2_base_index_functions::map_symbol_filenames
if (per_cu->is_debug_types || per_objfile->symtab_set_p (per_cu))
continue;
+ if (per_cu->fnd != nullptr)
+ {
+ file_and_directory *fnd = per_cu->fnd.get ();
+
+ const char *filename = fnd->get_name ();
+ const char *key = filename;
+ const char *fullname = nullptr;
+
+ if (need_fullname)
+ {
+ fullname = fnd->get_fullname ();
+ key = fullname;
+ }
+
+ if (!filenames_cache.seen (key))
+ fun (filename, fullname);
+ }
+
quick_file_names *file_data = dw2_get_file_names (per_cu, per_objfile);
if (file_data == nullptr
|| qfn_cache.find (file_data) != qfn_cache.end ())
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-12 15:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-12 15:40 [binutils-gdb] Add "fullname" handling to file_and_directory Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).