From patchwork Fri Apr 7 15:25:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67509 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 97D0E387090E for ; Fri, 7 Apr 2023 15:27:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 386AD3858404 for ; Fri, 7 Apr 2023 15:25:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 386AD3858404 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 9429010040637 for ; Fri, 7 Apr 2023 15:25:42 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id knyApJGGA2LM4knyApdkJl; Fri, 07 Apr 2023 15:25:42 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=KbQXDSUD c=1 sm=1 tr=0 ts=643035f6 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=YsoOj7E6qrNLeVQtAV0A:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LnfcVHhaH0vPTPuh/R5R5zD3v2A7+xjwDNK+raQYe6M=; b=UtrtMGYv3TJSgPPevhlt8bKHr1 vqp3+5z47fJ8RzM08yErAVVrrj8PKzngJYzNjwrhNFn61k8CtgXOmYTSMP19C+zaFr8igFrY8eTOc I+tkOxKDYZGHtZpEQH5bkRvxp; Received: from 75-166-159-36.hlrn.qwest.net ([75.166.159.36]:60392 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pknyA-001hDU-90 for gdb-patches@sourceware.org; Fri, 07 Apr 2023 09:25:42 -0600 From: Tom Tromey Date: Fri, 07 Apr 2023 09:25:46 -0600 Subject: [PATCH 14/19] Convert abbrev cache to new hash table MIME-Version: 1.0 Message-Id: <20230407-t-robin-hood-hash-v1-14-900d93ef1510@tromey.com> References: <20230407-t-robin-hood-hash-v1-0-900d93ef1510@tromey.com> In-Reply-To: <20230407-t-robin-hood-hash-v1-0-900d93ef1510@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.159.36 X-Source-L: No X-Exim-ID: 1pknyA-001hDU-90 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-159-36.hlrn.qwest.net ([192.168.0.21]) [75.166.159.36]:60392 X-Source-Auth: tom+tromey.com X-Email-Count: 15 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This converts the DWARF abbrev cache to use the new hash table. --- gdb/dwarf2/abbrev-cache.c | 35 ++--------------------------------- gdb/dwarf2/abbrev-cache.h | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 40 deletions(-) diff --git a/gdb/dwarf2/abbrev-cache.c b/gdb/dwarf2/abbrev-cache.c index 6de81cd8075..6ee2660e2f3 100644 --- a/gdb/dwarf2/abbrev-cache.c +++ b/gdb/dwarf2/abbrev-cache.c @@ -21,33 +21,6 @@ #include "dwarf2/read.h" #include "dwarf2/abbrev-cache.h" -/* Hash function for an abbrev table. */ - -hashval_t -abbrev_cache::hash_table (const void *item) -{ - const struct abbrev_table *table = (const struct abbrev_table *) item; - return to_underlying (table->sect_off); -} - -/* Comparison function for abbrev table. */ - -int -abbrev_cache::eq_table (const void *lhs, const void *rhs) -{ - const struct abbrev_table *l_table = (const struct abbrev_table *) lhs; - const search_key *key = (const search_key *) rhs; - return (l_table->section == key->section - && l_table->sect_off == key->offset); -} - -abbrev_cache::abbrev_cache () - : m_tables (htab_create_alloc (20, hash_table, eq_table, - htab_delete_entry, - xcalloc, xfree)) -{ -} - void abbrev_cache::add (abbrev_table_up table) { @@ -55,11 +28,7 @@ abbrev_cache::add (abbrev_table_up table) if (table == nullptr) return; - search_key key = { table->section, table->sect_off }; - void **slot = htab_find_slot_with_hash (m_tables.get (), &key, - to_underlying (table->sect_off), - INSERT); + auto insert_pair = m_tables.insert (std::move (table)); /* If this one already existed, then it should have been reused. */ - gdb_assert (*slot == nullptr); - *slot = (void *) table.release (); + gdb_assert (insert_pair.second); } diff --git a/gdb/dwarf2/abbrev-cache.h b/gdb/dwarf2/abbrev-cache.h index d9406534c5d..bfd48d796c4 100644 --- a/gdb/dwarf2/abbrev-cache.h +++ b/gdb/dwarf2/abbrev-cache.h @@ -21,12 +21,13 @@ #define GDB_DWARF2_ABBREV_CACHE_H #include "dwarf2/abbrev.h" +#include "gdbsupport/hash-table.h" /* An abbrev cache holds abbrev tables for easier reuse. */ class abbrev_cache { public: - abbrev_cache (); + abbrev_cache () = default; DISABLE_COPY_AND_ASSIGN (abbrev_cache); /* Find an abbrev table coming from the abbrev section SECTION at @@ -36,8 +37,10 @@ class abbrev_cache { search_key key = { section, offset }; - return (abbrev_table *) htab_find_with_hash (m_tables.get (), &key, - to_underlying (offset)); + auto iter = m_tables.find (key, to_underlying (offset)); + if (iter == m_tables.end ()) + return nullptr; + return iter->get (); } /* Add TABLE to this cache. Ownership of TABLE is transferred to @@ -49,17 +52,37 @@ class abbrev_cache private: - static hashval_t hash_table (const void *item); - static int eq_table (const void *lhs, const void *rhs); - struct search_key { struct dwarf2_section_info *section; sect_offset offset; }; + struct abbrev_traits + { + typedef abbrev_table_up value_type; + + static bool is_empty (const value_type &val) + { return val == nullptr; } + + static bool equals (const value_type &lhs, const value_type &rhs) + { + return lhs->section == rhs->section && lhs->sect_off == rhs->sect_off; + } + + static bool equals (const value_type &lhs, const search_key &rhs) + { + return lhs->section == rhs.section && lhs->sect_off == rhs.offset; + } + + static size_t hash (const value_type &val) + { + return to_underlying (val->sect_off); + } + }; + /* Hash table of abbrev tables. */ - htab_up m_tables; + gdb::traited_hash_table m_tables; }; #endif /* GDB_DWARF2_ABBREV_CACHE_H */