From patchwork Thu Dec 23 07:45:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12698002 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2850C433F5 for ; Thu, 23 Dec 2021 08:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EpigL69BZUy2P5V7bd4VzIICjHD2mIxafkNKJtLUi+Y=; b=EOFEKG2w1HSH8vHgAlHMPExora H3y48dgsn0/y5Vu8S7PwZ60s9NaeQGMA0qQYSJkYgfZdKx3m9uaFemM2GtiFW0ZZGz6Ijk7aCIu8k po5dZxsLTwQH+vM/MlYD2byjeZpXgoPhgU4qzojA/Shhw4whBQeTaaWzfVAZq7nTEgkmDKdfBsD7X k2vvUhPbEu/IJBo5RnDZHHvs/bIcf/+RuVnjQytkBoqEtZjFV1I+uulyPyHw2skmwp2TSEeInaYsg hhcQorZTS5WvU4jfUlr5BQMpycsR62SEBRSr4NN2ZImPEqDQduKdUlGOUBf/Wm+0ZzOWJQ453ikRl /Z7EsX4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0J2i-00C5Vs-K0; Thu, 23 Dec 2021 08:01:41 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0IoY-00Bzl1-GJ for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 07:47:04 +0000 Received: by mail-yb1-xb49.google.com with SMTP id t184-20020a2546c1000000b006008b13c80bso8746402yba.1 for ; Wed, 22 Dec 2021 23:47:01 -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=jkb8WQdF9O+yiT4urJzPw184L/fpHPkSKVmnEzvHNI4=; b=cjmUrPorOPwMSR8Clp9D3BUztfdQynd9f+mTH9gfaUFdKwgXLjEpecPhtWm10pTf95 kUko6md3ZhP8VUeVp+cOBc0Jy7VYksiU+XwG9bEZJZwyYpL5+WlBI25m6x8I0AoE7YBy /5hIfsd9OEg5Sd6a2fM8L2GTWOy0Qy3BrRE2imlAsxGVpL2bAMTuwSXqDv6IBpjLDw28 Cih2qQTG3eSXRCzQsGWh/12JzeNtpxdPyM8wv8uXQza4zo9nnDbamcbPPwJEiqNLD2q9 b6L5BCdYsBLbBj+19qoSMjTDstctOdLIIZKT6surEGtmeqFG6rPdV/KQvv303T+YxZTW YSAA== 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=jkb8WQdF9O+yiT4urJzPw184L/fpHPkSKVmnEzvHNI4=; b=3s9DjTMEs0DWOeoIovsPw8OQ/Q401p0ndSdXyoAP3n5jbC7+OjEZkbl2oyduJ9FJtT if7hwW9QPHypOI0rw309I0mMgDi6cAiDO2NTKnpeSw+3EWD+kNSSgKIjMLeHDosJdmPO 7ZFeotuTldORTu+rcSFR4nDD1Bi/LmNCXYTWCpnt83AzdsqPt7m2yzBvFyJ+kH8Duxlo 0H/Q5zBduci4w2nQWoAPDNYDOcYmM0/pgj5XnauH4+Eeanwo/m/oPjPaBRB8I0OYPmwK vu1Kocsllrt/VUJBzncsMrFCH2rck7j0rX9Q+uc1jKLGs/9XpkcpSw+KZPvQL3soI2SW PDbw== X-Gm-Message-State: AOAM530UIG5SE1h0S7XLYMT4txFPfYQuqNGGBCeZYxvSgmrfdxtiowMS OQF8sAhXsKs+Gx766m9UEBL9zqXpnkBV X-Google-Smtp-Source: ABdhPJzRHzlckq6o8uuyeTGVvKZ4mtq8Xw/HKmt9jKvhxGET/afj05hc3jdaQ7vdvPJiKVhC3up45BXHd1bO X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:4fef:90ff:589d:24ca]) (user=irogers job=sendgmr) by 2002:a25:d492:: with SMTP id m140mr1874549ybf.105.1640245620849; Wed, 22 Dec 2021 23:47:00 -0800 (PST) Date: Wed, 22 Dec 2021 23:45:14 -0800 In-Reply-To: <20211223074541.3318938-1-irogers@google.com> Message-Id: <20211223074541.3318938-22-irogers@google.com> Mime-Version: 1.0 References: <20211223074541.3318938-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.307.g9b7440fafd-goog Subject: [PATCH v2 21/48] perf cpumap: Add some comments to cpu_aggr_map 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 Cc: eranian@google.com, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211222_234702_582145_C2A0B614 X-CRM114-Status: GOOD ( 12.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move cpu_aggr_map__empty_new to be with other cpu_aggr_map function. Reviewed-by: James Clark Signed-off-by: Ian Rogers --- tools/perf/util/cpumap.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index 832fc53f3c11..8acef8ff8753 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -24,16 +24,18 @@ struct aggr_cpu_id { int core; }; +/** A collection of aggr_cpu_id values, the "built" version is sorted and uniqued. */ struct cpu_aggr_map { refcount_t refcnt; + /** Number of valid entries. */ int nr; + /** The entries. */ struct aggr_cpu_id map[]; }; struct perf_record_cpu_map_data; struct perf_cpu_map *perf_cpu_map__empty_new(int nr); -struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr); struct perf_cpu_map *cpu_map__new_data(struct perf_record_cpu_map_data *data); size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size); @@ -67,6 +69,12 @@ int cpu__get_die_id(int cpu); */ int cpu__get_core_id(int cpu); +/** + * cpu_aggr_map__empty_new - Create a cpu_aggr_map of size nr with every entry + * being empty. + */ +struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr); + typedef struct aggr_cpu_id (*aggr_cpu_id_get_t)(int cpu, void *data); /**