From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/25] libperf: Move perf's cpu_map__idx() to perf_cpu_map__idx()
Date: Thu, 22 Aug 2019 18:00:39 -0300 [thread overview]
Message-ID: <20190822210100.3461-5-acme@kernel.org> (raw)
In-Reply-To: <20190822210100.3461-1-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
As an internal function that will be used by both perf and libperf, but
is not exported at this point.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190822111141.25823-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/lib/cpumap.c | 12 ++++++++++++
tools/perf/lib/include/internal/cpumap.h | 2 ++
tools/perf/util/cpumap.c | 14 +-------------
tools/perf/util/cpumap.h | 1 -
tools/perf/util/evlist.c | 2 +-
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/tools/perf/lib/cpumap.c b/tools/perf/lib/cpumap.c
index 63f7df7e47ff..2834753576b2 100644
--- a/tools/perf/lib/cpumap.c
+++ b/tools/perf/lib/cpumap.c
@@ -242,3 +242,15 @@ bool perf_cpu_map__empty(const struct perf_cpu_map *map)
{
return map ? map->map[0] == -1 : true;
}
+
+int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
+{
+ int i;
+
+ for (i = 0; i < cpus->nr; ++i) {
+ if (cpus->map[i] == cpu)
+ return i;
+ }
+
+ return -1;
+}
diff --git a/tools/perf/lib/include/internal/cpumap.h b/tools/perf/lib/include/internal/cpumap.h
index 3306319f7df8..840d4032587b 100644
--- a/tools/perf/lib/include/internal/cpumap.h
+++ b/tools/perf/lib/include/internal/cpumap.h
@@ -14,4 +14,6 @@ struct perf_cpu_map {
#define MAX_NR_CPUS 2048
#endif
+int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
+
#endif /* __LIBPERF_INTERNAL_CPUMAP_H */
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index 4402e67445a4..8e6c2cbffedc 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -458,19 +458,7 @@ int cpu__setup_cpunode_map(void)
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu)
{
- return cpu_map__idx(cpus, cpu) != -1;
-}
-
-int cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
-{
- int i;
-
- for (i = 0; i < cpus->nr; ++i) {
- if (cpus->map[i] == cpu)
- return i;
- }
-
- return -1;
+ return perf_cpu_map__idx(cpus, cpu) != -1;
}
int cpu_map__cpu(struct perf_cpu_map *cpus, int idx)
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index 3e068090612f..8dbedda7af45 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -62,5 +62,4 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,
int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);
-int cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
#endif /* __PERF_CPUMAP_H */
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index ba49b5ecffd0..8582560b59af 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -758,7 +758,7 @@ static int perf_evlist__mmap_per_evsel(struct evlist *evlist, int idx,
if (evsel->system_wide && thread)
continue;
- cpu = cpu_map__idx(evsel->core.cpus, evlist_cpu);
+ cpu = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
if (cpu == -1)
continue;
--
2.21.0
next prev parent reply other threads:[~2019-08-22 21:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 21:00 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 01/25] tools headers: Add missing perf_event.h include Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 02/25] perf tools: Use perf_cpu_map__nr instead of cpu_map__nr Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 03/25] libperf: Move perf's cpu_map__empty() to perf_cpu_map__empty() Arnaldo Carvalho de Melo
2019-08-22 21:00 ` Arnaldo Carvalho de Melo [this message]
2019-08-22 21:00 ` [PATCH 05/25] perf arm64: Add missing debug.h header Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 06/25] perf kvm s390: Add missing string.h header Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 07/25] perf metricgroup: Remove needless includes from metricgroup.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 08/25] perf evsel: Move xyarray.h from evsel.c to evsel.h to reduce include dep tree Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 09/25] perf counts: Add missing headers needed for types used Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 10/25] perf bpf: Add missing xyarray.h header Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 11/25] perf evlist: " Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 12/25] perf script: Add missing counts.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 13/25] perf tests: " Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 14/25] perf stat: " Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 15/25] perf scripting python: Add missing counts.h header Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 16/25] perf evsel: Add missing perf/evsel.h header in util/evsel.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 17/25] perf evsel: Remove needless counts.h header from util/evsel.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 18/25] perf evsel: Remove needless stddef.h " Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 19/25] perf evsel: util/evsel.h needs stdio.h as it uses FILE Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 20/25] perf x86 kvm-stat: Add missing string.h header Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 21/25] perf evsel: Switch to libperf's cpumap.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 22/25] perf cpumap: Remove needless includes from cpumap.h Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 23/25] libperf: Add perf_thread_map__nr/perf_thread_map__pid functions Arnaldo Carvalho de Melo
2019-08-22 21:00 ` [PATCH 24/25] perf c2c: Fix report with offline cpus Arnaldo Carvalho de Melo
2019-08-22 21:01 ` [PATCH 25/25] libperf: Fix alignment trap with xyarray contents in 'perf stat' Arnaldo Carvalho de Melo
2019-08-23 10:30 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190822210100.3461-5-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome