From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sQEhN4npX2q3DyIAWB0awg (envelope-from ) for ; Tue, 21 Jul 2026 17:50:01 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=BnmsPUOg; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CB6951E033; Tue, 21 Jul 2026 17:50:01 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E6BDE1E033 for ; Tue, 21 Jul 2026 17:50:00 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 992624BA2E16 for ; Tue, 21 Jul 2026 21:49:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 992624BA2E16 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=BnmsPUOg Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id CD1364BA543C for ; Tue, 21 Jul 2026 21:49:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD1364BA543C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CD1364BA543C Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784670577; cv=none; b=pCRB/vd63z+UOrWZJEm64OaExqEKJfTjnA19aB0vMOBClTLSSAQDx+0Jj3OO2ANPjVwaU4GVRkIpbCWp6XfD9YFGib8Xnbg0M/j2nDk7V5o3QMj7jlALACsyMxL188Ujoes4bMM1FFWLTz3JwZvIGa9r+7KLu7w+hm8JPinoog0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1784670577; c=relaxed/simple; bh=sl5xG5FPwzzhi4albDwumlw3kxZczySSzweWLdj/45Q=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=llfCqeRua0eAQzQ9L5JRHk3TWOjMdrRDmAssnRaFT7g+00Z8rYQzb7GXF7EMrHEeDdcfXm8rcS4zHLZfOBfUL/FO8zaQfOd7iYCUa/On0wHl9WoqjYIvBAVz3ETxXbKNrPJBCyLSYWA1UDwBaRMcea939Uneqq9nI/815/6Glek= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=BnmsPUOg DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD1364BA543C Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-49545ba3d4eso28740785e9.3 for ; Tue, 21 Jul 2026 14:49:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784670576; x=1785275376; darn=sourceware.org; h=content-transfer-encoding:content-type:in-reply-to:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to:content-type; bh=OlaGh/+f/Iv+Q7U0b/0ZgLHBdpKAejUf2ZX7lNtXN/I=; b=BnmsPUOgh1VlgvDcJ+2HyHL/8JvMjqQ0kZwpPm7eEiDmkzG/osLrTDnNpm9eNI1EGm YUFU5yhYoCMgysMEHWnBfKsvPrAaHe+m/DG78VDbZXGURalkPOYpE6pPWoppFQrMcOrn O0QzSuVEo9zQmYTHi/i6tR1jg7j1wQzJmNOqQm601Qraj3w7eVKJqxXpzUV/M2llmtar 9Jk1FW4hUlXWyYZe6qLrGXQulbL4VoPOmrrZVKQSblsbtHZMgKOiRVRG5Xwsg4mXbfoL 92cm9mB7eYTk+2PzpW/qAaoBgXum12/WQHilw9UZMSDtNCFl20M90BS8T6Ph/SCAiigX Mv3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784670576; x=1785275376; h=content-transfer-encoding:content-type:in-reply-to:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OlaGh/+f/Iv+Q7U0b/0ZgLHBdpKAejUf2ZX7lNtXN/I=; b=iZYOeuCbL7AP4RDCldOwnzTUrRj4muO5vpxyAtf/jv5L//qj8Cn8o/voo0PAl1xw2C PejULaHuulnggEGLsBd593IzUDva1mOZwF5bR3yr7+S+DFbQWgWVEm1GwBvPdDXIs7Wz n1XiI6rMRzZ4qGqZqDlo5zzZOZ17NSGjV9bm1XkWaIOa20bBwkwF4Oo6PVt7b+8nuQa+ Os6F5zDaOFfMF58PU41z/zc3RT9rARQKGr9+DJgNUkeRDzuZL/LRmlEO8jeScufQAXWZ 0ORkGzPPxwBAmLe1w64kvLJqZTCC+JgAFaZjuEf2SR42k45AQCEMTuORPa2vSa69k62z ZzZA== X-Forwarded-Encrypted: i=1; AHgh+RqMvulF/wOJd/af/kreb+9aEkvBDuj4X12P2S75gsLtsh5DJQ7EzRKVJ77bDcwWP4pBsYP3k2X4MsVi5Q==@sourceware.org X-Gm-Message-State: AOJu0YyEByKXn5l8J+MX45HtD/KeVxokVJ07H/EjOsGh7SLpISNRnE8k YZaw67aVu5W9W2eqgRmpFwwd1y2gYF+YZyzeynzX+Hx579516wDTu5hn X-Gm-Gg: AfdE7clcw47fJ5k7PDOva8l7rEvcZlv0Q6Z365UsPxWTx66+GT7i0tqtLBGeaDKXdgA Xd0Wc0/k2sFDoWwAKwVgFW3jTaan9divirWAjOi00Umg1O/uffUlC4noC97p8WWNw9RSZyo3HTG V+QcFFsVgjXH3xU4dhbtfNyuMgJNf5zr7ZtBdJ6jjAHKqz4iCx6WsYrRipDvQYwSOE57aFn5w6u RrFc5ZM5i6jmRqfgwpDdhzYt+L6mGS8nOnHZ8yNX5KwTgocCFfQHz5m7lnyBlcnwT40MFaypETA hqpyZvxfrFoJ4A/m08gzK+9PhiJ1yqrQ1YI0kAANgcZAjE9XcR+bFhDPrLOG9rkfuARnjJ+Mret msYYWZTAVK9dtNxl1LP5Ty6TkLc4AeZQNNgApfYCWVgNKO9IMukHb8f3ygGQAIjRb8y/xTHhPQj B7a42VOADffzjtjO4= X-Received: by 2002:a05:600c:4585:b0:492:45a0:dcef with SMTP id 5b1f17b1804b1-4954a3eeb63mr229281725e9.5.1784670575660; Tue, 21 Jul 2026 14:49:35 -0700 (PDT) Received: from [192.168.0.38] ([86.12.216.189]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63e49acesm40471066f8f.6.2026.07.21.14.49.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Jul 2026 14:49:35 -0700 (PDT) Message-ID: Date: Tue, 21 Jul 2026 22:49:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 08/10] gdb/linux-tdep: migrate parse_smaps_data to file_reader_t Content-Language: en-US To: Matthieu Longo , gdb-patches@sourceware.org Cc: Luis Machado , Andrew Burgess , Yury Khrustalev , Pedro Alves , Tom Tromey References: <20260707154900.94542-1-matthieu.longo@arm.com> <20260707154900.94542-9-matthieu.longo@arm.com> From: Luis In-Reply-To: <20260707154900.94542-9-matthieu.longo@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Empty commit message. On 07/07/2026 16:48, Matthieu Longo wrote: > --- > gdb/linux-tdep.c | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c > index f1cea3040f9..dbc69a5a7fc 100644 > --- a/gdb/linux-tdep.c > +++ b/gdb/linux-tdep.c > @@ -1530,18 +1530,17 @@ parse_smaps_key_value (const char *keyword, const char *line, > /* Helper function to parse the contents of /proc//smaps into a data > structure, for easy access. > > - DATA is the contents of the smaps file. The parsed contents are stored > - into the SMAPS vector. */ > + FREADER is a wrapper around the contents of the smaps file. > + The parsed contents are stored into the SMAPS vector. */ > > static std::vector > -parse_smaps_data (const char *data, > - const std::string &maps_filename) > +parse_smaps_data (const file_reader_t &freader) > { > char *line, *t; > > - gdb_assert (data != nullptr); > + gdb_assert (freader); > > - line = strtok_r ((char *) data, "\n", &t); > + line = strtok_r (freader.data (), "\n", &t); > > std::vector smaps; > > @@ -1597,8 +1596,8 @@ parse_smaps_data (const char *data, > > if (sscanf (line, "%64s", keyword) != 1) > { > - warning (_("Error parsing {s,}maps file '%s'"), > - maps_filename.c_str ()); > + warning (_("Error parsing keyword in {s,}maps file '%s'"), > + freader.c_filepath ()); > break; > } > > @@ -1612,12 +1611,12 @@ parse_smaps_data (const char *data, > decode_vmflags (line, &v); > > if (parse_smaps_key_value (keyword, line, "Rss:", > - maps_filename, > + freader.filepath (), > &rss)) > continue; > > if (parse_smaps_key_value (keyword, line, "Swap:", > - maps_filename, > + freader.filepath (), > &swap)) > continue; > > @@ -1628,8 +1627,9 @@ parse_smaps_data (const char *data, > > if (sscanf (line, "%*s%lu", &number) != 1) > { > - warning (_("Error parsing {s,}maps file '%s' number"), > - maps_filename.c_str ()); > + warning (_("Error parsing numeric value associated with " > + "key '%s' in {s,}maps file '%s'"), > + keyword, freader.c_filepath ()); > break; > } > if (number > 0) > @@ -1679,12 +1679,6 @@ parse_smaps_data (const char *data, > return smaps; > } > > -static std::vector > -parse_smaps_data (const file_reader_t &freader) > -{ > - return parse_smaps_data (freader.data (), freader.filepath ()); > -} > - > /* Helper that checks if an address is in a memory tag page for a live > process. */ > Otherwise looks reasonable. Reviewed-By: Luis Machado