From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v3 13/33] Add "fullname" handling to file_and_directory
Date: Sat, 4 Dec 2021 13:38:24 -0700 [thread overview]
Message-ID: <20211204203844.1188999-14-tom@tromey.com> (raw)
In-Reply-To: <20211204203844.1188999-1-tom@tromey.com>
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.
---
gdb/dwarf2/file-and-dir.h | 18 ++++++++++++++++++
gdb/dwarf2/read.c | 24 ++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/gdb/dwarf2/file-and-dir.h b/gdb/dwarf2/file-and-dir.h
index 1a9ccf35829..fc6219311ed 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
@@ -89,6 +90,20 @@ struct file_and_directory
m_name = name;
}
+ /* 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. */
@@ -102,6 +117,9 @@ struct file_and_directory
/* 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 58a5e228044..37f929f3f5b 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->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->mark = 1;
+ continue;
+ }
+ }
+
quick_file_names *file_data = dw2_get_file_names (per_cu.get (),
per_objfile);
if (file_data == NULL)
--
2.31.1
next prev parent reply other threads:[~2021-12-04 20:38 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-04 20:38 [PATCH v3 00/33] Rewrite the DWARF "partial" reader Tom Tromey
2021-12-04 20:38 ` [PATCH v3 01/33] Split create_addrmap_from_aranges Tom Tromey
2021-12-04 20:38 ` [PATCH v3 02/33] Fix latent bug in read_addrmap_from_aranges Tom Tromey
2021-12-04 20:38 ` [PATCH v3 03/33] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2021-12-04 20:38 ` [PATCH v3 04/33] Refactor dwarf2_get_pc_bounds Tom Tromey
2021-12-04 20:38 ` [PATCH v3 05/33] Allow ada_decode not to decode operators Tom Tromey
2021-12-04 20:38 ` [PATCH v3 06/33] Let skip_one_die not skip children Tom Tromey
2021-12-04 20:38 ` [PATCH v3 07/33] Add name splitting Tom Tromey
2021-12-04 20:38 ` [PATCH v3 08/33] Add new overload of dwarf5_djb_hash Tom Tromey
2021-12-04 20:38 ` [PATCH v3 09/33] Refactor build_type_psymtabs_reader Tom Tromey
2021-12-04 20:38 ` [PATCH v3 10/33] Add batching parameter to parallel_for_each Tom Tromey
2021-12-04 20:38 ` [PATCH v3 11/33] Return vector of results from parallel_for_each Tom Tromey
2022-03-29 17:36 ` Pedro Alves
2022-03-29 20:07 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 12/33] Specialize std::hash for gdb_exception Tom Tromey
2021-12-04 20:38 ` Tom Tromey [this message]
2021-12-07 17:17 ` [PATCH v3 13/33] Add "fullname" handling to file_and_directory Tom Tromey
2021-12-04 20:38 ` [PATCH v3 14/33] Introduce DWARF abbrev cache Tom Tromey
2021-12-04 20:38 ` [PATCH v3 15/33] Statically examine abbrev properties Tom Tromey
2021-12-04 20:38 ` [PATCH v3 16/33] Update skip_one_die for new " Tom Tromey
2021-12-04 20:38 ` [PATCH v3 17/33] Introduce the new DWARF index class Tom Tromey
2021-12-04 20:38 ` [PATCH v3 18/33] The new DWARF indexer Tom Tromey
2022-03-29 18:04 ` Pedro Alves
2022-03-29 20:08 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 19/33] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2021-12-04 20:38 ` [PATCH v3 20/33] Wire in the new DWARF indexer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 21/33] Introduce thread-safe handling for complaints Tom Tromey
2021-12-04 20:38 ` [PATCH v3 22/33] Pre-read DWARF section data Tom Tromey
2021-12-04 20:38 ` [PATCH v3 23/33] Parallelize DWARF indexing Tom Tromey
2022-03-30 10:24 ` Pedro Alves
2022-03-30 20:23 ` Tom Tromey
2022-03-30 21:24 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 24/33] "Finalize" the DWARF index in the background Tom Tromey
2021-12-04 20:38 ` [PATCH v3 25/33] Rename write_psymtabs_to_index Tom Tromey
2021-12-04 20:38 ` [PATCH v3 26/33] Change the key type in psym_index_map Tom Tromey
2021-12-04 20:38 ` [PATCH v3 27/33] Change parameters to write_address_map Tom Tromey
2021-12-04 20:38 ` [PATCH v3 28/33] Genericize addrmap handling in the DWARF index writer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 29/33] Adapt .gdb_index writer to new DWARF scanner Tom Tromey
2021-12-04 20:38 ` [PATCH v3 30/33] Adapt .debug_names " Tom Tromey
2021-12-04 20:38 ` [PATCH v3 31/33] Enable the new DWARF indexer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 32/33] Delete DWARF psymtab code Tom Tromey
2021-12-04 20:38 ` [PATCH v3 33/33] Remove dwarf2_per_cu_data::v Tom Tromey
2022-01-05 17:18 ` [PATCH v3 00/33] Rewrite the DWARF "partial" reader Tom Tromey
2022-03-24 16:18 ` Tom Tromey
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=20211204203844.1188999-14-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@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: link
Be 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).