From mboxrd@z Thu Jan 1 00:00:00 1970 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 9646EC433FE for ; Wed, 5 Jan 2022 06:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238073AbiAEGPw (ORCPT ); Wed, 5 Jan 2022 01:15:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237912AbiAEGPN (ORCPT ); Wed, 5 Jan 2022 01:15:13 -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 3E631C0617A2 for ; Tue, 4 Jan 2022 22:15:13 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a9-20020a251a09000000b0060b2c94d515so56597229yba.20 for ; Tue, 04 Jan 2022 22:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ewN6TgeYhi7NNspT4fCbrjPDfPPrcTRTO0RxDMRaTEI=; b=T4QTIVVf6MChV8kYFahTMIlnIWjfDM2Pz4nZGLcvbAgVmMvSnAfRZzR3TWKRnTT8Qg uW84zNDkePRuuqvBP+GaSI0aSYMHhSvvV2enYbfYt3qm176fWAtaX7S4FRbee/wIqxp3 L/k3jjOAbBR0QFqB0Hzdv0thUW4H1DbTmCl596UpOj6qstJuZpl52Rm3aEJV+z/QGSDC iE0XS9XqpPzBPfD/Nd/WNjjGkM6MbRnrSmoGo6YVT00qfc8/iTojNxB2ZjuCxRPGsAqB lVODIyrsyA0su0WMr/kjGr+UekZnVI/BlKzo35vZS06DZC9TW3l/gGe3wPA8pemnDXwQ 5CiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ewN6TgeYhi7NNspT4fCbrjPDfPPrcTRTO0RxDMRaTEI=; b=MSW7zyq9M+KrKjE70fW57Lvoc8M/MMpfCCxfEyik1SkUw3HyXHg189pyHpuDnVHHB0 yez/xJYw0myPg+WmxoN4uMhDdM4irRzzI2cqmRqHOfRvfAzpvlViyowRzzzUOYtbkc2T 4sKZz84hwfHgONCNP5EH9DiGZBIPg8UejJwxrlKDDIMhhpFsp4qzIQn3XI9BhCqfrlpf cZmfVTyMmcsAEbvtW1BVYm87uwY36AmbOXL5xU76zWQzEcyvDMqFSa4yiXiMCCvbUaH3 toiLo4dwUojp0eAMDfAdLM7WXlp3CnbTcAMEsJFpZjGi2FEWhnKNNhVqJShBtcMcSmgD rjsQ== X-Gm-Message-State: AOAM531MjnEDzOlIHp07kBhw5BX4cJp0XKfPRSyh2LWMBUHCoCIS1YRg OWl7Fpm0dlvTBV0Ix0b9HKP3Zu0rvkGF X-Google-Smtp-Source: ABdhPJwwG3mTg4oT2fYpRqR1bZ5fv8nAUrwDtQtv9qYKgk1o53MMLlA/bzYOULWt31L4uSwq3pHmdOdhDpKP X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:3af1:caef:2937:5d2b]) (user=irogers job=sendgmr) by 2002:a25:2e0a:: with SMTP id u10mr43339373ybu.246.1641363312500; Tue, 04 Jan 2022 22:15:12 -0800 (PST) Date: Tue, 4 Jan 2022 22:13:33 -0800 In-Reply-To: <20220105061351.120843-1-irogers@google.com> Message-Id: <20220105061351.120843-31-irogers@google.com> Mime-Version: 1.0 References: <20220105061351.120843-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v4 30/48] perf stat: Rename aggr_data cpu to imply it's an index From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com Cc: eranian@google.com, Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Trying to make cpu maps less error prone. Signed-off-by: Ian Rogers --- tools/perf/util/stat-display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index f48d1678861c..7e933a8fee68 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -626,7 +626,7 @@ struct aggr_data { u64 ena, run, val; struct aggr_cpu_id id; int nr; - int cpu; + int cpu_map_idx; }; static void aggr_cb(struct perf_stat_config *config, @@ -878,9 +878,9 @@ static void counter_cb(struct perf_stat_config *config __maybe_unused, { struct aggr_data *ad = data; - ad->val += perf_counts(counter->counts, ad->cpu, 0)->val; - ad->ena += perf_counts(counter->counts, ad->cpu, 0)->ena; - ad->run += perf_counts(counter->counts, ad->cpu, 0)->run; + ad->val += perf_counts(counter->counts, ad->cpu_map_idx, 0)->val; + ad->ena += perf_counts(counter->counts, ad->cpu_map_idx, 0)->ena; + ad->run += perf_counts(counter->counts, ad->cpu_map_idx, 0)->run; } /* @@ -897,7 +897,7 @@ static void print_counter(struct perf_stat_config *config, struct aggr_cpu_id id; for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) { - struct aggr_data ad = { .cpu = cpu }; + struct aggr_data ad = { .cpu_map_idx = cpu }; if (!collect_data(config, counter, counter_cb, &ad)) return; -- 2.34.1.448.ga2b2bfdf31-goog