From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.47.129]) by sourceware.org (Postfix) with ESMTPS id BEF2C386103F for ; Sat, 18 Jul 2020 17:29:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BEF2C386103F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway22.websitewelcome.com (Postfix) with ESMTP id DD72147D15 for ; Sat, 18 Jul 2020 12:29:19 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id wqeFjZdAYBb5dwqeFjR7hA; Sat, 18 Jul 2020 12:29:19 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=WJBoglrtbGP8xgT1wlaK0Zl2556j1+CuML8HSndbb04=; b=FjEB39k9B4Z2nAWmgT59im7/bV PL9LS3gqj+ei/1YyW1E7UltzPNCxxwoWWLjvc4pdV57k2Z7zbkctc/tyH9c8WZSq9dMT95aci5O2e KXmF/CUx7obPFzKg2ovT/I1t/; Received: from 174-16-104-48.hlrn.qwest.net ([174.16.104.48]:56458 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jwqeF-000fmD-5J; Sat, 18 Jul 2020 11:29:19 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/9] Use htab_up in filename_seen_cache Date: Sat, 18 Jul 2020 11:29:10 -0600 Message-Id: <20200718172915.6811-5-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200718172915.6811-1-tom@tromey.com> References: <20200718172915.6811-1-tom@tromey.com> 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: 174.16.104.48 X-Source-L: No X-Exim-ID: 1jwqeF-000fmD-5J X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-104-48.hlrn.qwest.net (bapiya.Home) [174.16.104.48]:56458 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3036.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Sat, 18 Jul 2020 17:29:27 -0000 This changes filename_seen_cache to use htab_up, rather than explicit calls to htab_delete. gdb/ChangeLog 2020-07-18 Tom Tromey * filename-seen-cache.c (filename_seen_cache::filename_seen_cache) (filename_seen_cache::clear): Update. (~filename_seen_cache): Remove. (filename_seen_cache::seen): Update. * filename-seen-cache.h (class filename_seen_cache) : Now htab_up. <~filename_seen_cache>: Default. : Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/filename-seen-cache.c | 17 +++++------------ gdb/filename-seen-cache.h | 6 +++--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/gdb/filename-seen-cache.c b/gdb/filename-seen-cache.c index f3905c0fb12..b0cda087cc0 100644 --- a/gdb/filename-seen-cache.c +++ b/gdb/filename-seen-cache.c @@ -27,10 +27,10 @@ /* filename_seen_cache constructor. */ filename_seen_cache::filename_seen_cache () + : m_tab (htab_create_alloc (INITIAL_FILENAME_SEEN_CACHE_SIZE, + filename_hash, filename_eq, + NULL, xcalloc, xfree)) { - m_tab = htab_create_alloc (INITIAL_FILENAME_SEEN_CACHE_SIZE, - filename_hash, filename_eq, - NULL, xcalloc, xfree); } /* See filename-seen-cache.h. */ @@ -38,14 +38,7 @@ filename_seen_cache::filename_seen_cache () void filename_seen_cache::clear () { - htab_empty (m_tab); -} - -/* See filename-seen-cache.h. */ - -filename_seen_cache::~filename_seen_cache () -{ - htab_delete (m_tab); + htab_empty (m_tab.get ()); } /* See filename-seen-cache.h. */ @@ -56,7 +49,7 @@ filename_seen_cache::seen (const char *file) void **slot; /* Is FILE in tab? */ - slot = htab_find_slot (m_tab, file, INSERT); + slot = htab_find_slot (m_tab.get (), file, INSERT); if (*slot != NULL) return true; diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h index ee064c32565..ccc47694fff 100644 --- a/gdb/filename-seen-cache.h +++ b/gdb/filename-seen-cache.h @@ -29,7 +29,7 @@ class filename_seen_cache { public: filename_seen_cache (); - ~filename_seen_cache (); + ~filename_seen_cache () = default; DISABLE_COPY_AND_ASSIGN (filename_seen_cache); @@ -55,12 +55,12 @@ class filename_seen_cache return 1; }; - htab_traverse_noresize (m_tab, erased_cb, &callback); + htab_traverse_noresize (m_tab.get (), erased_cb, &callback); } private: /* Table of files seen so far. */ - htab_t m_tab; + htab_up m_tab; }; #endif /* FILENAME_SEEN_CACHE_H */ -- 2.17.2