diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/maint.c | 7 | ||||
| -rw-r--r-- | gdb/maint.h | 2 | ||||
| -rw-r--r-- | gdb/minsyms.c | 18 |
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 @@ maintenance_set_profile_cmd (const char *args, int from_tty, } #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_time (int); 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 @@ minimal_symbol_reader::record_full (gdb::string_view name, 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 @@ minimal_symbol_reader::install () (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 |