From 74f8902dddbfa60bceae086be2c34ee7f1ca3c37 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 25 Nov 2024 22:16:48 -0500 Subject: [PATCH] gdbserver: use `gdb::unordered_map` Replace the few uses of `std::unordered_map` with `gdb::unordered_map`. The only one of these that is likely to ever see a lot of elements is probably `process_info::m_ptid_thread_map`. It was added precisely to improve performance when there are a lot of threads. So using `gdb::unordered_map` here won't hurt. Change-Id: Ibc4ede5245551fdd7717cb349a012d05726f4363 --- gdbserver/inferiors.h | 8 +++----- gdbserver/linux-aarch64-tdesc.cc | 4 ++-- gdbserver/server.cc | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gdbserver/inferiors.h b/gdbserver/inferiors.h index 5372a3cd5b7..a0635de7242 100644 --- a/gdbserver/inferiors.h +++ b/gdbserver/inferiors.h @@ -19,13 +19,11 @@ #ifndef GDBSERVER_INFERIORS_H #define GDBSERVER_INFERIORS_H -#include "gdbsupport/gdb_vecs.h" #include "gdbsupport/owning_intrusive_list.h" +#include "gdbsupport/unordered_map.h" #include "dll.h" -#include - struct thread_info; struct regcache; struct target_desc; @@ -94,7 +92,7 @@ struct process_info : public intrusive_list_node { return m_thread_list; } /* Return a reference to the private thread map. */ - std::unordered_map &thread_map () + gdb::unordered_map &thread_map () { return m_ptid_thread_map; } /* Find the first thread for which FUNC returns true. Return nullptr if no @@ -118,7 +116,7 @@ private: /* A map of ptid_t to thread_info*, for average O(1) ptid_t lookup. Exited threads do not appear in the map. */ - std::unordered_map m_ptid_thread_map; + gdb::unordered_map m_ptid_thread_map; }; /* Return a pointer to the current process. Note that the current diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc index 39d5bccdce1..52642d52be2 100644 --- a/gdbserver/linux-aarch64-tdesc.cc +++ b/gdbserver/linux-aarch64-tdesc.cc @@ -24,7 +24,7 @@ #include "arch/aarch64.h" #include "linux-aarch32-low.h" #include -#include +#include "gdbsupport/unordered_map.h" /* Create the aarch64 target description. */ @@ -35,7 +35,7 @@ aarch64_linux_read_description (const aarch64_features &features) this function as the in-process-agent calls this function from a constructor function, when globals might not yet have been initialised. */ - static std::unordered_map tdesc_aarch64_map; + static gdb::unordered_map tdesc_aarch64_map; if (features.vq > AARCH64_MAX_SVE_VQ) error (_("VQ is %" PRIu64 ", maximum supported value is %d"), features.vq, diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 069795650a5..6e11b2e9633 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -35,7 +35,7 @@ #include "dll.h" #include "hostio.h" #include -#include +#include "gdbsupport/unordered_map.h" #include "gdbsupport/common-inferior.h" #include "gdbsupport/job-control.h" #include "gdbsupport/environ.h" @@ -947,7 +947,7 @@ handle_general_set (char *own_buf) It's nicer if we only print the final options for each TID, and if we only print about it if the options changed compared to the options that were previously set on the thread. */ - std::unordered_map set_options; + gdb::unordered_map set_options; while (*p != '\0') { -- 2.39.5