public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v3 24/33] "Finalize" the DWARF index in the background
Date: Sat,  4 Dec 2021 13:38:35 -0700	[thread overview]
Message-ID: <20211204203844.1188999-25-tom@tromey.com> (raw)
In-Reply-To: <20211204203844.1188999-1-tom@tromey.com>

After scanning the CUs, the DWARF indexer merges all the data into a
single vector, canonicalizing C++ names as it proceeds.  While not
necessarily single-threaded, this process is currently done in just
one thread, to keep memory costs lower.

However, this work is all done without reference to any data outside
of the indexes.  This patch improves the apparent performance of GDB
by moving it to the background.  All uses of the index are then made
to wait for this process to complete.

In our ongoing example, this reduces the scanning time on gdb itself
to 0.173937 (wall).  Recall that before this patch, the time was
0.668923; and psymbol reader does this in 1.598869.  That is, at the
end of this series, we see about a 10x speedup.
---
 gdb/dwarf2/cooked-index.c | 10 ++++++++--
 gdb/dwarf2/cooked-index.h | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index bb10b884a43..7e114c4edd2 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -117,9 +117,13 @@ cooked_index::add (sect_offset die_offset, enum dwarf_tag tag,
 }
 
 cooked_index_vector::cooked_index_vector (vec_type &&vec)
-  : m_vector (std::move (vec))
+  : m_vector (std::move (vec)),
+    m_future (gdb::thread_pool::g_thread_pool->post_task
+	      ([this] ()
+	      {
+		finalize ();
+	      }))
 {
-  finalize ();
 }
 
 /* See cooked-index.h.  */
@@ -152,6 +156,8 @@ cooked_index_vector::get_addrmaps ()
 cooked_index_vector::range
 cooked_index_vector::find (gdb::string_view name, bool completing)
 {
+  m_future.wait ();
+
   auto lower = std::lower_bound (m_entries.begin (), m_entries.end (),
 				 name,
 				 [=] (const cooked_index_entry *entry,
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index a4bfc3eb183..365150b8692 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -254,6 +254,17 @@ class cooked_index_vector
   explicit cooked_index_vector (vec_type &&vec);
   DISABLE_COPY_AND_ASSIGN (cooked_index_vector);
 
+  ~cooked_index_vector ()
+  {
+    /* The 'finalize' method may be run in a different thread.  If
+       this object is destroyed before this completes, then the method
+       will end up writing to freed memory.  Waiting for this to
+       complete avoids this problem; and the cost seems ignorable
+       because creating and immediately destroying the debug info is a
+       relatively rare thing to do.  */
+    m_future.wait ();
+  }
+
   /* A simple range over part of m_entries.  */
   typedef iterator_range<std::vector<cooked_index_entry *>::iterator> range;
 
@@ -265,6 +276,7 @@ class cooked_index_vector
   /* Return a range of all the entries.  */
   range all_entries ()
   {
+    m_future.wait ();
     return { m_entries.begin (), m_entries.end () };
   }
 
@@ -305,6 +317,11 @@ class cooked_index_vector
 
   /* Storage for canonical names.  */
   std::vector<gdb::unique_xmalloc_ptr<char>> m_names;
+
+  /* A future that tracks when the 'finalize' method is done.  Note
+     that the 'get' method is never called on this future, only
+     'wait'.  */
+  std::future<void> m_future;
 };
 
 #endif /* GDB_DWARF2_COOKED_INDEX_H */
-- 
2.31.1


  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 ` [PATCH v3 13/33] Add "fullname" handling to file_and_directory Tom Tromey
2021-12-07 17:17   ` 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 ` Tom Tromey [this message]
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-25-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).