From: John Baldwin <jhb@FreeBSD.org>
To: gdb-patches@sourceware.org
Subject: [RFC PATCH 02/12] x86-nat: Use an unordered_map to store per-pid debug reg state.
Date: Mon, 28 Feb 2022 16:24:09 -0800 [thread overview]
Message-ID: <20220301002419.5122-3-jhb@FreeBSD.org> (raw)
In-Reply-To: <20220301002419.5122-1-jhb@FreeBSD.org>
This replaces a manual linked list which used O(n) lookup and
removal.
---
gdb/x86-nat.c | 99 ++++++++++-----------------------------------------
1 file changed, 18 insertions(+), 81 deletions(-)
diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
index d0d52a00265..cb323393e82 100644
--- a/gdb/x86-nat.c
+++ b/gdb/x86-nat.c
@@ -22,6 +22,8 @@
#include "gdbcmd.h"
#include "inferior.h"
+#include <unordered_map>
+
/* Support for hardware watchpoints and breakpoints using the x86
debug registers.
@@ -36,75 +38,27 @@
/* Low-level function vector. */
struct x86_dr_low_type x86_dr_low;
-/* Per-process data. We don't bind this to a per-inferior registry
- because of targets like x86 GNU/Linux that need to keep track of
- processes that aren't bound to any inferior (e.g., fork children,
- checkpoints). */
-
-struct x86_process_info
-{
- /* Linked list. */
- struct x86_process_info *next;
-
- /* The process identifier. */
- pid_t pid;
-
- /* Copy of x86 hardware debug registers. */
- struct x86_debug_reg_state state;
-};
-
-static struct x86_process_info *x86_process_list = NULL;
-
-/* Find process data for process PID. */
-
-static struct x86_process_info *
-x86_find_process_pid (pid_t pid)
-{
- struct x86_process_info *proc;
-
- for (proc = x86_process_list; proc; proc = proc->next)
- if (proc->pid == pid)
- return proc;
-
- return NULL;
-}
-
-/* Add process data for process PID. Returns newly allocated info
- object. */
-
-static struct x86_process_info *
-x86_add_process (pid_t pid)
-{
- struct x86_process_info *proc = XCNEW (struct x86_process_info);
-
- proc->pid = pid;
- proc->next = x86_process_list;
- x86_process_list = proc;
-
- return proc;
-}
-
-/* Get data specific info for process PID, creating it if necessary.
- Never returns NULL. */
-
-static struct x86_process_info *
-x86_process_info_get (pid_t pid)
-{
- struct x86_process_info *proc;
-
- proc = x86_find_process_pid (pid);
- if (proc == NULL)
- proc = x86_add_process (pid);
-
- return proc;
-}
+/* Hash table storing per-process data. We don't bind this to a
+ per-inferior registry because of targets like x86 GNU/Linux that
+ need to keep track of processes that aren't bound to any inferior
+ (e.g., fork children, checkpoints). */
+
+static std::unordered_map<pid_t,
+ gdb::unique_xmalloc_ptr<struct x86_debug_reg_state>>
+x86_debug_process_state;
/* Get debug registers state for process PID. */
struct x86_debug_reg_state *
x86_debug_reg_state (pid_t pid)
{
- return &x86_process_info_get (pid)->state;
+ auto it = x86_debug_process_state.find (pid);
+ if (it != x86_debug_process_state.end ())
+ return it->second.get ();
+
+ struct x86_debug_reg_state *state = XCNEW (struct x86_debug_reg_state);
+ x86_debug_process_state.emplace (pid, state);
+ return state;
}
/* See declaration in x86-nat.h. */
@@ -112,24 +66,7 @@ x86_debug_reg_state (pid_t pid)
void
x86_forget_process (pid_t pid)
{
- struct x86_process_info *proc, **proc_link;
-
- proc = x86_process_list;
- proc_link = &x86_process_list;
-
- while (proc != NULL)
- {
- if (proc->pid == pid)
- {
- *proc_link = proc->next;
-
- xfree (proc);
- return;
- }
-
- proc_link = &proc->next;
- proc = *proc_link;
- }
+ x86_debug_process_state.erase (pid);
}
/* Clear the reference counts and forget everything we knew about the
--
2.34.1
next prev parent reply other threads:[~2022-03-01 0:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 0:24 [RFC PATCH 00/12] FreeBSD/aarch64 hardware watchpoint support John Baldwin
2022-03-01 0:24 ` [RFC PATCH 01/12] Remove USE_SIGTRAP_SIGINFO condition for FreeBSD/x86 debug regs support John Baldwin
2022-03-01 0:24 ` John Baldwin [this message]
2022-03-03 19:20 ` [RFC PATCH 02/12] x86-nat: Use an unordered_map to store per-pid debug reg state Pedro Alves
2022-03-04 1:06 ` John Baldwin
2022-03-01 0:24 ` [RFC PATCH 03/12] x86-nat: Add x86_lookup_debug_reg_state John Baldwin
2022-03-01 0:24 ` [RFC PATCH 04/12] Add an x86_fbsd_nat_target mixin class for FreeBSD x86 native targets John Baldwin
2022-03-01 0:24 ` [RFC PATCH 05/12] fbsd-nat: Add a low_new_fork virtual method John Baldwin
2022-03-01 0:24 ` [RFC PATCH 06/12] x86-fbsd-nat: Copy debug register state on fork John Baldwin
2022-03-01 0:24 ` [RFC PATCH 07/12] nat: Split out platform-independent aarch64 debug register support John Baldwin
2022-03-03 19:26 ` Pedro Alves
2022-03-05 0:06 ` John Baldwin
2022-03-01 0:24 ` [RFC PATCH 08/12] aarch64: Add an aarch64_nat_target mixin class John Baldwin
2022-03-01 0:24 ` [RFC PATCH 09/12] fbsd-nat: Add helper routine to fetch siginfo_t for a ptid John Baldwin
2022-03-01 0:24 ` [RFC PATCH 10/12] fbsd-nat: Add a low_delete_thread virtual method John Baldwin
2022-03-01 0:24 ` [RFC PATCH 11/12] fbsd-nat: Add a low_prepare_to_resume " John Baldwin
2022-03-01 0:24 ` [RFC PATCH 12/12] Add support for hardware breakpoints/watchpoints on FreeBSD/Aarch64 John Baldwin
2022-03-01 3:35 ` Eli Zaretskii
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=20220301002419.5122-3-jhb@FreeBSD.org \
--to=jhb@freebsd.org \
--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).