From patchwork Thu Dec 30 07:19:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12701277 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 3A815C433F5 for ; Thu, 30 Dec 2021 07:32:58 +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=LcTqA8CNpzYRrTxyRaMI+QHl1W1HePDXT332cTKgPIQ=; b=Psfwz1fYriIBirvomEMz9Ggxqv F00urypyzuaD3vW/Pr3lc1GX6Xjd8Ak+wrCWx0mUnmvw7enYzFTfG8wKjfkiGhwqP//05EqLZXJpB h0SzzzBhUIbsjA2Hn6QEYl1QnUHXqzGxli/zi9bkx312Jr8D/a+iN1czhr94FXs6Eyuw2lN50jaXV S/NRRHpymaqUGJgCsQ84BayQrlWB3N1eX6XVQBLeoibhqxrRQWb73KgjBLUot3/BuAz61yyK9xGuG 1zCOeQ9qiu3s2NPdmG1bFnDxHqyuRDq3lD/HpvxRF+lREvdim1rB22zKE/p882zdJ7M9Y00m2udxc zp76sYlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n2pty-003nbA-OH; Thu, 30 Dec 2021 07:31:07 +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 1n2pkY-003jhr-Jm for linux-arm-kernel@lists.infradead.org; Thu, 30 Dec 2021 07:21:24 +0000 Received: by mail-yb1-xb49.google.com with SMTP id s84-20020a254557000000b0060ac37f4bb1so29559901yba.5 for ; Wed, 29 Dec 2021 23:21:21 -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=hhL79Wui00dZGSHTjWRVzw6lUcXgmSFmqf1bVRl6br0=; b=W/fRAMC9kpPrEwbcvMgEXG7F9Cl6rN5fk2gbWiip8f1tvb35R7EkbWYsWtjKwnGx31 6458ZpyDPuljmbZitSfAoDeLyp+L4gLiUJOR+kUTuZUBzuGyqKOyU8gwb/VUn1cfu5Xb bSavnCEULtqH35kSm5tKiIv+7db4/OxK1ovSNMRYFHH6jKCDnNHdejGLaK5HH2+iSOGs U0P5lZmaJb7bnm0Zr+VXBFILii+scZ56YZyh67ksndHuLTRM/LlgcQK+aTJw3FiFU95O eupdDGJba1WEO5ZyEk3Pv2W5n3y290I1yiYCoPphHpGJip/SG/QRBLeQxQwg/WiHR1uF HZAg== 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=hhL79Wui00dZGSHTjWRVzw6lUcXgmSFmqf1bVRl6br0=; b=UbSurw5PIYtpSjsxmhU/VhHd4ucvyT6/96/T2uIInrpYMsVkw8nX5VKv4jtOnmd7K8 twO5L7JvkPhlG7PAQrGeDVWBcqQVbALS0Q1TxiIvnNjq/4W8qclDqIxdYiC6SUppaCqk yFz/DOTVBenlnB3WNGrUcM5VK21di5630P/tQi8oV23hGeYR0ugP61bMQi9aTMxabaQl GEFvdGiL5OYSHVQ0tJ0RNbsGTfpLGRSvN4TAxW18QG6QyZ3eMvbTHLXwQq+WO7IYiZTB Q84Ux262ZSRbLPghLmSSR6jApUI2I2qkUmKCBrxuPDVhWQ89+uwT49dEmhYy2/xJL1xj XymQ== X-Gm-Message-State: AOAM532QfbkiYKG6vyDxTAhRIwrX4gjiy+XC8caCfjeMbUVZwF23ScPH gpMeu83RWClaOmWZB0TBpUZvau9VY9CI X-Google-Smtp-Source: ABdhPJw354XwUZfwTBDRfRyvXFfv5WltLOFmo0PhT3He8ODD0IPkVaOuwJseB0/EjcNjYitQD/bT3pZWBsm1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:31c4:9539:dba1:a82b]) (user=irogers job=sendgmr) by 2002:a25:186:: with SMTP id 128mr17816765ybb.244.1640848880990; Wed, 29 Dec 2021 23:21:20 -0800 (PST) Date: Wed, 29 Dec 2021 23:19:59 -0800 In-Reply-To: <20211230072030.302559-1-irogers@google.com> Message-Id: <20211230072030.302559-19-irogers@google.com> Mime-Version: 1.0 References: <20211230072030.302559-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH v3 17/48] perf cpumap: Remove cpu_map__cpu, use libperf function. 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211229_232122_687553_1DB003FD X-CRM114-Status: GOOD ( 15.42 ) 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 Switch the remaining few users of cpu_map__cpu to perf_cpu_map__cpu and remove the function. Reviewed-by: James Clark Signed-off-by: Ian Rogers --- tools/perf/builtin-ftrace.c | 2 +- tools/perf/util/cpumap.c | 9 ++------- tools/perf/util/cpumap.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 2b54e2ddc80a..f16c39a37a52 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -281,7 +281,7 @@ static int set_tracing_cpumask(struct perf_cpu_map *cpumap) int ret; int last_cpu; - last_cpu = cpu_map__cpu(cpumap, cpumap->nr - 1); + last_cpu = perf_cpu_map__cpu(cpumap, cpumap->nr - 1); mask_size = last_cpu / 4 + 2; /* one more byte for EOS */ mask_size += last_cpu / 32; /* ',' is needed for every 32th cpus */ diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index e0d7f1da5858..32f9fc2dd389 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -485,11 +485,6 @@ bool cpu_map__has(struct perf_cpu_map *cpus, int cpu) return perf_cpu_map__idx(cpus, cpu) != -1; } -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx) -{ - return cpus->map[idx]; -} - size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size) { int i, cpu, start = -1; @@ -547,7 +542,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) int i, cpu; char *ptr = buf; unsigned char *bitmap; - int last_cpu = cpu_map__cpu(map, map->nr - 1); + int last_cpu = perf_cpu_map__cpu(map, map->nr - 1); if (buf == NULL) return 0; @@ -559,7 +554,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) } for (i = 0; i < map->nr; i++) { - cpu = cpu_map__cpu(map, i); + cpu = perf_cpu_map__cpu(map, i); bitmap[cpu / 8] |= 1 << (cpu % 8); } diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index a053bf31a3f0..87545bcd461d 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -80,7 +80,6 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, struct aggr_cpu_id (*f)(int cpu, void *data), void *data); -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); bool cpu_map__has(struct perf_cpu_map *cpus, int cpu); bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b);