From patchwork Sun Jul 9 17:01:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 72397 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 330DA385AF9F for ; Sun, 9 Jul 2023 17:03:25 +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 AD1873858438 for ; Sun, 9 Jul 2023 17:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD1873858438 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 5B93C100482B3 for ; Sun, 9 Jul 2023 17:01:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IXnBqAmUXNX2aIXnBqcVg4; Sun, 09 Jul 2023 17:01:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=64aae7fd a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=ws7JD89P4LkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=SmtZPBz3_MideT66nMwA: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=uDz7ChImXeW2ZqD1WMn1wPgjg5AYgXrcBAPWmrP2yE4=; b=PonkND+L9xWqGRcJyuGL1PQyfG 0cpi6lMb7OuSMBwQ8CA+b0B4oQe+QoVZg1/PMhgoyQYDXC3gjfkwzbbK8Iylz77VElhwh0ia9EERR uLfDkyEvAId/01ytNPdrexsOJ; Received: from 75-166-135-140.hlrn.qwest.net ([75.166.135.140]:52250 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qIXnB-001oeb-0a for gdb-patches@sourceware.org; Sun, 09 Jul 2023 11:01:49 -0600 From: Tom Tromey Date: Sun, 09 Jul 2023 11:01:51 -0600 Subject: [PATCH 5/8] Use function_view in traceframe_walk_blocks MIME-Version: 1.0 Message-Id: <20230709-trace-cleanups-v1-5-c410e1072fab@tromey.com> References: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> In-Reply-To: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 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.135.140 X-Source-L: No X-Exim-ID: 1qIXnB-001oeb-0a X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-135-140.hlrn.qwest.net ([192.168.0.21]) [75.166.135.140]:52250 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 change traceframe_walk_blocks to take a function_view. This simplifies the code somewhat and lets us entirely remove one helper function. --- gdb/tracefile-tfile.c | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index 364f8c1f08e..d3304b0b355 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -773,33 +773,15 @@ tfile_target::trace_find (enum trace_find_type type, int num, return -1; } -/* Prototype of the callback passed to tframe_walk_blocks. */ -typedef int (*walk_blocks_callback_func) (char blocktype, void *data); - -/* Callback for traceframe_walk_blocks, used to find a given block - type in a traceframe. */ - -static int -match_blocktype (char blocktype, void *data) -{ - char *wantedp = (char *) data; - - if (*wantedp == blocktype) - return 1; - - return 0; -} - /* Walk over all traceframe block starting at POS offset from - CUR_OFFSET, and call CALLBACK for each block found, passing in DATA - unmodified. If CALLBACK returns true, this returns the position in - the traceframe where the block is found, relative to the start of - the traceframe (cur_offset). Returns -1 if no callback call - returned true, indicating that all blocks have been walked. */ + CUR_OFFSET, and call CALLBACK for each block found. If CALLBACK + returns true, this returns the position in the traceframe where the + block is found, relative to the start of the traceframe + (cur_offset). Returns -1 if no callback call returned true, + indicating that all blocks have been walked. */ static int -traceframe_walk_blocks (walk_blocks_callback_func callback, - int pos, void *data) +traceframe_walk_blocks (gdb::function_view callback, int pos) { /* Iterate through a traceframe's blocks, looking for a block of the requested type. */ @@ -814,7 +796,7 @@ traceframe_walk_blocks (walk_blocks_callback_func callback, ++pos; - if ((*callback) (block_type, data)) + if (callback (block_type)) return pos; switch (block_type) @@ -854,7 +836,10 @@ traceframe_walk_blocks (walk_blocks_callback_func callback, static int traceframe_find_block_type (char type_wanted, int pos) { - return traceframe_walk_blocks (match_blocktype, pos, &type_wanted); + return traceframe_walk_blocks ([&] (char blocktype) + { + return blocktype == type_wanted; + }, pos); } /* Look for a block of saved registers in the traceframe, and get the @@ -1060,11 +1045,9 @@ tfile_target::get_trace_state_variable_value (int tsvnum, LONGEST *val) /* Callback for traceframe_walk_blocks. Builds a traceframe_info object for the tfile target's current traceframe. */ -static int -build_traceframe_info (char blocktype, void *data) +static bool +build_traceframe_info (char blocktype, struct traceframe_info *info) { - struct traceframe_info *info = (struct traceframe_info *) data; - switch (blocktype) { case 'M': @@ -1104,7 +1087,7 @@ build_traceframe_info (char blocktype, void *data) break; } - return 0; + return false; } traceframe_info_up @@ -1112,7 +1095,10 @@ tfile_target::traceframe_info () { traceframe_info_up info (new struct traceframe_info); - traceframe_walk_blocks (build_traceframe_info, 0, info.get ()); + traceframe_walk_blocks ([&] (char blocktype) + { + return build_traceframe_info (blocktype, info.get ()); + }, 0); return info; }