Message ID | 20230302041211.852330-2-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4033092wrd; Wed, 1 Mar 2023 20:14:40 -0800 (PST) X-Google-Smtp-Source: AK7set9rYAeLYfP3vBzYCuO9xYkmMDheMlZ6wdg8gTfEq7PvncsaueJ/zgCOzYywn4sPuDJNvxgp X-Received: by 2002:a05:6a20:c502:b0:cc:395f:e1ed with SMTP id gm2-20020a056a20c50200b000cc395fe1edmr8791353pzb.22.1677730480307; Wed, 01 Mar 2023 20:14:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677730480; cv=none; d=google.com; s=arc-20160816; b=Jj6iGi1i2sJPr1icuj0bp5zK5uTVplPZPme4SokvTq+Q3KNSwfwWgnjfnDGNcH4kDX IJ32+e+dH7KTsHcpnZBIR3plJ8nT36FQsLdXoziNcIqNBMvhYwo455Nzrz4CIAsO5/t8 JBZWn0HBb7cT4s1mnjpmT2LGBeaCwsT309Fc2gXdbPqTcqV3pT3dYSgsSbz3S7lWIDNO 5RpY5yM1wnGVdIxWz73q5VchGnKJW9zTGtwUdgERwqT0rGkzzkW0JK8Gu48HAYShnLDi VYDf7oWBtlvFsV6EGCvg+yrXQVC2d1PVkPGlJ5iZOJlvRbxLZE3Aw+JsVhEYCVunkso0 wEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=+HlToJfehRhwifEwaYoS40OI/SsPSnYmXMj6fUkz2Ls=; b=svWmOy+CF4mCpu3wd2S1pgmW7aEPSOCzOSXi55Lnec8dp/Vks79zUAlRP0L+vltrL2 b5iySbqaL6KyOk7Vym4iOyvvJBKJ1VyYvq0zvaX54LxS9BfP4bbEqjpKcJHXjhxWxkVy Ox52+2PSOpZXkByfYQOk3lA6+j0EnDT97n67TJpqCyLeamp0qvhBlAUlWdIX8vnmErQE 15b+hVuM0j3PpXS6x0FUF4jkLY7s3/El+sMUYJqeJrO1BzwOOJhFBrrbLeLkLOMeIbwF u7l/yjCDxX9AmkjwpM1zq3dZLSEGczWhOtCHZMGjs064lg1U6na7Zr6Fx9h1+V/9gD2E hQVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qevYgswA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k191-20020a6384c8000000b004fb9c2c58cfsi14777321pgd.418.2023.03.01.20.14.27; Wed, 01 Mar 2023 20:14:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qevYgswA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229788AbjCBEMx (ORCPT <rfc822;davidbtadokoro@gmail.com> + 99 others); Wed, 1 Mar 2023 23:12:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229779AbjCBEMq (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 1 Mar 2023 23:12:46 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BA924AFD9 for <linux-kernel@vger.kernel.org>; Wed, 1 Mar 2023 20:12:44 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id 66-20020a250245000000b00a53c1100d72so2754718ybc.0 for <linux-kernel@vger.kernel.org>; Wed, 01 Mar 2023 20:12:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677730363; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+HlToJfehRhwifEwaYoS40OI/SsPSnYmXMj6fUkz2Ls=; b=qevYgswAKLTMJHEpZ1D1rEx/wavZ8kB2WNYP1lCXw7WBpA/nHbKIZmNSPWC5ob4DhT 7k0KxAShaTJ0mwzvG4+i02UJBYmj3XZd3TsitdcsrP90PomolW/s/Y83V0G+ZDuBh17F f78faMJJN1lWF4bzwdBtmeqxtDMrxn4iH3Mz26EZKZnYYyKHx5iaTdsBtRR2zABdiCAp qG+tHXcvei5IJNJBmGJlTkfoiQ9i8/DhuB0cSa9GRLJJOBDNHdBUvZ8sTyH5hMRQAsKR UKZLkeojPJAr/7Rv9h7xHt6ErpJHb60esoMn4Mcja/SYSXOxysgXYSC8ASWEXi1xzWU1 Ig9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677730363; 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=+HlToJfehRhwifEwaYoS40OI/SsPSnYmXMj6fUkz2Ls=; b=etgslwY2vJg00Czr/fzQ363MYjFVcIwQkezGk2Q8pU2V9fD2rYN8sg+aYtgO9NEMbw jmHAqWXsPQl0LV6s5ZyiM7grKDhwqjH+e8soVGiLGZCwLgPEg4bw9f7AZtc7kwIGEwGE AgrnTeqIXuVD/ICzPTtdMypwUW7SRZDXgtDcufCT2GuLe93V75oscxqQh5DskWaGpxjQ WMM6+Fda7MsfBsn5zb2dH4QJ4cO0yM8B5//V2d76Jojr7LZYgM34kMxRtl5b1Rp7HhHw 1EpE4GHWQDxwiJCTunkVtmIC1p9aiZsbier64CA8cYgrrT2l1SzBIGT866Am1YZMvV1+ o1ZA== X-Gm-Message-State: AO0yUKVJLy7RZ/NHvkZ4PB0imh0EE27saf0V8IEBTIV/hCbmdFEZpWVn pxbTfIJb3AtlCcrYY5YOY1cpdtT0Vtqx X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bdf9:f5cb:d05:c4d5]) (user=irogers job=sendgmr) by 2002:a5b:98d:0:b0:a59:4709:c785 with SMTP id c13-20020a5b098d000000b00a594709c785mr13ybq.678.1677730362957; Wed, 01 Mar 2023 20:12:42 -0800 (PST) Date: Wed, 1 Mar 2023 20:12:02 -0800 In-Reply-To: <20230302041211.852330-1-irogers@google.com> Message-Id: <20230302041211.852330-2-irogers@google.com> Mime-Version: 1.0 References: <20230302041211.852330-1-irogers@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Subject: [PATCH v1 01/10] libperf evlist: Avoid a use of evsel idx From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Kan Liang <kan.liang@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Adrian Hunter <adrian.hunter@intel.com>, "Steinar H. Gunderson" <sesse@google.com>, Qi Liu <liuqi115@huawei.com>, Kim Phillips <kim.phillips@amd.com>, Florian Fischer <florian.fischer@muhq.space>, James Clark <james.clark@arm.com>, Suzuki Poulouse <suzuki.poulose@arm.com>, Sean Christopherson <seanjc@google.com>, Leo Yan <leo.yan@linaro.org>, John Garry <john.g.garry@oracle.com>, Kajol Jain <kjain@linux.ibm.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com> Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759227916364944803?= X-GMAIL-MSGID: =?utf-8?q?1759227916364944803?= |
Series |
Better fixes for grouping of events
|
|
Commit Message
Ian Rogers
March 2, 2023, 4:12 a.m. UTC
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 <irogers@google.com>
---
tools/lib/perf/evlist.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
Comments
Em Wed, Mar 01, 2023 at 08:12:02PM -0800, Ian Rogers escreveu: > 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. Looks ok > Signed-off-by: Ian Rogers <irogers@google.com> > --- > 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, struct perf_mmap *map, > > void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *leader) > { > - struct perf_evsel *first, *last, *evsel; > - > - first = list_first_entry(list, struct perf_evsel, node); > - last = list_last_entry(list, struct perf_evsel, node); > - > - leader->nr_members = last->idx - first->idx + 1; > + struct perf_evsel *evsel; > + int n = 0; > > - __perf_evlist__for_each_entry(list, evsel) > + __perf_evlist__for_each_entry(list, evsel) { > evsel->leader = leader; > + n++; > + } > + leader->nr_members = n; > } > > void perf_evlist__set_leader(struct perf_evlist *evlist) > -- > 2.39.2.722.g9855ee24e9-goog >
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, struct perf_mmap *map, void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *leader) { - struct perf_evsel *first, *last, *evsel; - - first = list_first_entry(list, struct perf_evsel, node); - last = list_last_entry(list, struct perf_evsel, node); - - leader->nr_members = last->idx - first->idx + 1; + struct perf_evsel *evsel; + int n = 0; - __perf_evlist__for_each_entry(list, evsel) + __perf_evlist__for_each_entry(list, evsel) { evsel->leader = leader; + n++; + } + leader->nr_members = n; } void perf_evlist__set_leader(struct perf_evlist *evlist)