From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.baldwin.cx (unknown [IPv6:2607:f138:0:13::2]) by sourceware.org (Postfix) with ESMTPS id 8D1293858C78 for ; Tue, 1 Mar 2022 00:24:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8D1293858C78 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id E461F1A84C70 for ; Mon, 28 Feb 2022 19:24:28 -0500 (EST) From: John Baldwin 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 Message-Id: <20220301002419.5122-3-jhb@FreeBSD.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301002419.5122-1-jhb@FreeBSD.org> References: <20220301002419.5122-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Mon, 28 Feb 2022 19:24:29 -0500 (EST) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2022 00:24:30 -0000 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 + /* 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> +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