From patchwork Wed Nov 27 21:40:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36332 Received: (qmail 71558 invoked by alias); 27 Nov 2019 21:40:20 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 71434 invoked by uid 89); 27 Nov 2019 21:40:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN autolearn=ham version=3.3.1 spammy=elapsed X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Nov 2019 21:40:17 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id CF2F020362; Wed, 27 Nov 2019 16:40:13 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id DAE8A20484; Wed, 27 Nov 2019 16:40:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id A946220AF6; Wed, 27 Nov 2019 16:40:07 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Wed, 27 Nov 2019 16:40:06 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Christian Biesinger , Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] Turn off threaded minsym demangling by default X-Gerrit-Change-Id: I92ba4f6bbf07363189666327cad452d6b9c8e01d X-Gerrit-Change-Number: 687 X-Gerrit-ChangeURL: X-Gerrit-Commit: 62e77f56f0ce8b10122881d8f0acd70e113fde93 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, cbiesinger@google.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191127214007.A946220AF6@gnutoolchain-gerrit.osci.io> The original change was created by Christian Biesinger. 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 * 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 + * 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 + * 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 #include "safe-ctype.h" #include "gdbsupport/parallel-for.h" +#include "maint.h" #if CXX_STD_THREAD #include @@ -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