From nobody Wed Sep 10 05:36:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32FF7C74A44 for ; Sun, 12 Mar 2023 02:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbjCLCQH (ORCPT ); Sat, 11 Mar 2023 21:16:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229836AbjCLCQE (ORCPT ); Sat, 11 Mar 2023 21:16:04 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 844563C7BB for ; Sat, 11 Mar 2023 18:16:03 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id t25-20020a252d19000000b00b341ad1b626so4128614ybt.19 for ; Sat, 11 Mar 2023 18:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587362; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LkP3cjlyFBuY4lwBhuPasBEAZ8EXgvKaf+XTugs0ORk=; b=dl6rB5hFHv9SCNUubl2rtwaN/dDMjOatwZ3MmZLo5IRBFOs7mnSBoXwIjFci/ORyq7 5RQDqJSUEQtUyt43HW3aGm/afwWgmb9tIv1ebmxPD92DsCu+t1Lru/Mc9sQ7wVk6Mulk wW/FmCvesK1PQRyVj6vqPrK3lUB3IvkDYwYN9iZthvBapK8LsBFRQ3YM/UJflOZGpTZj 8kT0qzU063vz5qPgqwQvW25/25DUN6fImshKtoY1/uXNE9slZ/+IOO42iNSaBzxzcyYL xV46aDRjr2Hi4tp6bOxFo7QUpVxrATRB32IpvrhXbR+Ic+JzsSKRtbIVp+Kk3DCYptdN wwUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587362; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LkP3cjlyFBuY4lwBhuPasBEAZ8EXgvKaf+XTugs0ORk=; b=Aueqzb0y/MzBnUuOXgmgEaEqfiCRtbrgvbsj21DMprQqbyach0UNcrvyAZg4f5D/8f OFkT63S5yGOX6yAByWoPmRVEiQs0Opdzc+gkGH2UomE4tioZeIeJhb/7eZY+DpSeNKyh woOPC9emR6SUPBdrQ4k/VaXMJ7QHnFW7UpbRSD8d82Nm+Lr3TMQShOa0Ur/woKKHm48g a+kFQv6tmcEKqvFjkHPVEnn0r+WYvLjPmeOplbiDzTyKCBP81QW4fUdo1FPjrBXLjHOj uumeNrAO5s2anBJJbS8ta1O27bTEYjy3IsD7qdng/QmAJM/7MXhE4kIN1nugHD+nnak0 k/zg== X-Gm-Message-State: AO0yUKXFabGhNVMmTsiqopPtvgC9cisI1C837sprDG3y/40acjDY2asb m58kpvLmkVP5ZzQGVFeNyyN5Qte7J+z5 X-Google-Smtp-Source: AK7set/kJBuEV+mbqnhAi0kuxu/g23f1XpN6oLJWkygemzlOuHhNBjhSuYPUA/SjPgoLxUZazwSQajtgf15R X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a81:b286:0:b0:533:9185:fc2c with SMTP id q128-20020a81b286000000b005339185fc2cmr20162639ywh.7.1678587362660; Sat, 11 Mar 2023 18:16:02 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:33 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-2-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 01/11] libperf evlist: Avoid a use of evsel idx From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Setting the leader iterates the list, so rather than use idx (which may be changed through list reordering) just count the elements and set afterwards. Signed-off-by: Ian Rogers --- tools/lib/perf/evlist.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index 61b637f29b82..2d6121e89ccb 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -687,15 +687,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, st= ruct perf_mmap *map, =20 void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *= leader) { - struct perf_evsel *first, *last, *evsel; - - first =3D list_first_entry(list, struct perf_evsel, node); - last =3D list_last_entry(list, struct perf_evsel, node); - - leader->nr_members =3D last->idx - first->idx + 1; + struct perf_evsel *evsel; + int n =3D 0; =20 - __perf_evlist__for_each_entry(list, evsel) + __perf_evlist__for_each_entry(list, evsel) { evsel->leader =3D leader; + n++; + } + leader->nr_members =3D n; } =20 void perf_evlist__set_leader(struct perf_evlist *evlist) --=20 2.40.0.rc1.284.g88254d51c5-goog