From: "Sourceware to Gerrit sync (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>
To: Christian Biesinger <cbiesinger@google.com>, gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@sourceware.org>
Subject: [pushed] Turn off threaded minsym demangling by default
Date: Wed, 27 Nov 2019 21:40:00 -0000 [thread overview]
Message-ID: <20191127214007.CE25828174@gnutoolchain-gerrit.osci.io> (raw)
In-Reply-To: <gerrit.1574132431000.I92ba4f6bbf07363189666327cad452d6b9c8e01d@gnutoolchain-gerrit.osci.io>
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/687
......................................................................
Turn off threaded minsym demangling by default
Per discussion on gdb-patches with Joel, this patch turns off multihreaded
symbol loading by default. It can be turned on using:
maint set worker-threads unlimited
To keep the behavior as close as possible to the old code, it still
calls symbol_set_names in the old place if n_worker_threads is 0.
gdb/ChangeLog:
2019-11-27 Christian Biesinger <cbiesinger@google.com>
* maint.c (n_worker_threads): Default to 0.
(worker_threads_disabled): New function.
* maint.h (worker_threads_disabled): New function.
* minsyms.c (minimal_symbol_reader::record_full): Call symbol_set_names
here if worker_threads_disabled () is true.
(minimal_symbol_reader::install): Skip all threading if
worker_threads_disabled () is true.
Change-Id: I92ba4f6bbf07363189666327cad452d6b9c8e01d
---
M gdb/ChangeLog
M gdb/maint.c
M gdb/maint.h
M gdb/minsyms.c
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 64c8ab5..3033cf6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2019-11-27 Christian Biesinger <cbiesinger@google.com>
+ * maint.c (n_worker_threads): Default to 0.
+ (worker_threads_disabled): New function.
+ * maint.h (worker_threads_disabled): New function.
+ * minsyms.c (minimal_symbol_reader::record_full): Call symbol_set_names
+ here if worker_threads_disabled () is true.
+ (minimal_symbol_reader::install): Skip all threading if
+ worker_threads_disabled () is true.
+
+2019-11-27 Christian Biesinger <cbiesinger@google.com>
+
* minsyms.c (add_minsym_to_hash_table): Use a previously computed
hash code if possible.
(add_minsym_to_demangled_hash_table): Likewise.
diff --git a/gdb/maint.c b/gdb/maint.c
index 7ab3fdb..dbc949a 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -845,7 +845,12 @@
}
#endif
-static int n_worker_threads = -1;
+static int n_worker_threads = 0;
+
+bool worker_threads_disabled ()
+{
+ return n_worker_threads == 0;
+}
/* Update the thread pool for the desired number of threads. */
static void
diff --git a/gdb/maint.h b/gdb/maint.h
index 827964d..cbaf9de 100644
--- a/gdb/maint.h
+++ b/gdb/maint.h
@@ -26,6 +26,8 @@
extern void set_per_command_space (int);
+extern bool worker_threads_disabled ();
+
/* Records a run time and space usage to be used as a base for
reporting elapsed time or change in space. */
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 94240c9..4f7260b 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -54,6 +54,7 @@
#include <algorithm>
#include "safe-ctype.h"
#include "gdbsupport/parallel-for.h"
+#include "maint.h"
#if CXX_STD_THREAD
#include <mutex>
@@ -1137,6 +1138,15 @@
else
msymbol->name = name.data ();
+ if (worker_threads_disabled ())
+ {
+ /* To keep our behavior as close as possible to the previous non-threaded
+ behavior for GDB 9.1, we call symbol_set_names here when threads
+ are disabled. */
+ symbol_set_names (msymbol, msymbol->name, false, m_objfile->per_bfd);
+ msymbol->name_set = 1;
+ }
+
SET_MSYMBOL_VALUE_ADDRESS (msymbol, address);
MSYMBOL_SECTION (msymbol) = section;
@@ -1407,10 +1417,12 @@
(msym, demangled_name,
&m_objfile->per_bfd->storage_obstack);
msym->name_set = 1;
-
- hash_values[idx].mangled_name_hash
- = fast_hash (msym->name, hash_values[idx].name_length);
}
+ /* This mangled_name_hash computation has to be outside of
+ the name_set check, or symbol_set_names below will
+ be called with an invalid hash value. */
+ hash_values[idx].mangled_name_hash
+ = fast_hash (msym->name, hash_values[idx].name_length);
hash_values[idx].minsym_hash
= msymbol_hash (msym->linkage_name ());
/* We only use this hash code if the search name differs
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I92ba4f6bbf07363189666327cad452d6b9c8e01d
Gerrit-Change-Number: 687
Gerrit-PatchSet: 3
Gerrit-Owner: Christian Biesinger <cbiesinger@google.com>
Gerrit-Reviewer: Christian Biesinger <cbiesinger@google.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: merged
next prev parent reply other threads:[~2019-11-27 21:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 3:00 [review] " Christian Biesinger (Code Review)
2019-11-19 21:54 ` Christian Biesinger (Code Review)
2019-11-22 23:48 ` Tom Tromey (Code Review)
2019-11-26 21:53 ` [review v2] " Christian Biesinger (Code Review)
2019-11-26 21:55 ` Tom Tromey (Code Review)
2019-11-27 21:40 ` Sourceware to Gerrit sync (Code Review) [this message]
2019-11-27 21:40 ` [pushed] " Sourceware to Gerrit sync (Code Review)
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=20191127214007.CE25828174@gnutoolchain-gerrit.osci.io \
--to=gerrit@gnutoolchain-gerrit.osci.io \
--cc=cbiesinger@google.com \
--cc=gdb-patches@sourceware.org \
--cc=noreply@gnutoolchain-gerrit.osci.io \
--cc=tromey@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).