From patchwork Fri Apr 7 15:25:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67511 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 6E012385356A for ; Fri, 7 Apr 2023 15:27:29 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id 172E7385842A for ; Fri, 7 Apr 2023 15:25:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 172E7385842A 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 cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id AEDBA10048762 for ; Fri, 7 Apr 2023 15:25:41 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id kny9pbB6mzLqskny9ph3zR; Fri, 07 Apr 2023 15:25:41 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=M+SIlw8s c=1 sm=1 tr=0 ts=643035f5 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=lD6fMf488kMWFAAwEFgA: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=XGz2WfWtEZwu1+mLvv0VK8GfBhyA+5Alr4a+HCsgc2A=; b=EUh2q1y0G+D8HQuC50Z019VqmQ ruCfNipxStFlt6inaeD+avZHrV6BMRVp8MsRmFkhv1+EeYEuSyK6hgle1/7u5CZF6S5Agx9bq0IQC SU2Yiu3KzMENhbd8cROLWm+QQ; 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 1pkny9-001hDU-Hl for gdb-patches@sourceware.org; Fri, 07 Apr 2023 09:25:41 -0600 From: Tom Tromey Date: Fri, 07 Apr 2023 09:25:40 -0600 Subject: [PATCH 08/19] Convert py-framefilter.c to new hash table MIME-Version: 1.0 Message-Id: <20230407-t-robin-hood-hash-v1-8-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: 1pkny9-001hDU-Hl 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: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.7 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 py-framefilter.c to use the new hash table. --- gdb/python/py-framefilter.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 0e8b2409636..987920c5a60 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -28,11 +28,11 @@ #include "stack.h" #include "source.h" #include "annotate.h" -#include "hashtab.h" #include "demangle.h" #include "mi/mi-cmds.h" #include "python-internal.h" #include "gdbsupport/gdb_optional.h" +#include "gdbsupport/hash-table.h" #include "cli/cli-style.h" enum mi_print_types @@ -731,6 +731,8 @@ py_print_args (PyObject *filter, return EXT_LANG_BT_OK; } +typedef gdb::hash_set levels_printed_hash; + /* Print a single frame to the designated output stream, detecting whether the output is MI or console, and formatting the output according to the conventions of that protocol. FILTER is the @@ -749,7 +751,8 @@ py_print_args (PyObject *filter, static enum ext_lang_bt_status py_print_frame (PyObject *filter, frame_filter_flags flags, enum ext_lang_frame_args args_type, - struct ui_out *out, int indent, htab_t levels_printed) + struct ui_out *out, int indent, + levels_printed_hash &levels_printed) { int has_addr = 0; CORE_ADDR address = 0; @@ -859,23 +862,16 @@ py_print_frame (PyObject *filter, frame_filter_flags flags, && (location_print || (out->is_mi_like_p () && (print_frame_info || print_args)))) { - struct frame_info **slot; - int level; - - slot = (frame_info **) htab_find_slot (levels_printed, - frame.get(), INSERT); - - level = frame_relative_level (frame); + int level = frame_relative_level (frame); /* Check if this frame has already been printed (there are cases where elided synthetic dummy-frames have to 'borrow' the frame architecture from the eliding frame. If that is the case, do not print 'level', but print spaces. */ - if (*slot == frame) + if (!levels_printed.insert (frame.get ()).second) out->field_skip ("level"); else { - *slot = frame.get (); annotate_frame_begin (print_level ? level : 0, gdbarch, address); out->text ("#"); @@ -1195,10 +1191,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, if (iterable == Py_None) return EXT_LANG_BT_NO_FILTERS; - htab_up levels_printed (htab_create (20, - htab_hash_pointer, - htab_eq_pointer, - NULL)); + levels_printed_hash levels_printed; while (true) { @@ -1230,7 +1223,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, try { success = py_print_frame (item.get (), flags, args_type, out, 0, - levels_printed.get ()); + levels_printed); } catch (const gdb_exception_error &except) {