public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Add "fullname" handling to file_and_directory Date: Tue, 12 Apr 2022 15:40:16 +0000 (GMT) [thread overview] Message-ID: <20220412154016.353F23858C27@sourceware.org> (raw) 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 ())
reply other threads:[~2022-04-12 15:40 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220412154016.353F23858C27@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).