From: James Clark <james.clark@arm.com>
To: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
jolsa@redhat.com
Cc: james.clark@arm.com, 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>,
Namhyung Kim <namhyung@kernel.org>,
Thomas Richter <tmricht@linux.ibm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 05/13 v4] perf tools: add new map type for aggregation
Date: Fri, 13 Nov 2020 19:26:46 +0200 [thread overview]
Message-ID: <20201113172654.989-6-james.clark@arm.com> (raw)
In-Reply-To: <20201113172654.989-1-james.clark@arm.com>
Currently this is a duplicate of perf_cpu_map so that
it can be used as a drop in replacement.
In a later commit it will be changed from a map of ints
to use the new cpu_aggr_id struct.
No functional changes.
Signed-off-by: James Clark <james.clark@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: John Garry <john.garry@huawei.com>
---
tools/perf/util/cpumap.c | 32 ++++++++++++++++++++++++++++++++
tools/perf/util/cpumap.h | 10 ++++++++++
2 files changed, 42 insertions(+)
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index e777024c6676..7500225c8571 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -95,6 +95,38 @@ struct perf_cpu_map *perf_cpu_map__empty_new(int nr)
return cpus;
}
+struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr)
+{
+ struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(int) * nr);
+
+ if (cpus != NULL) {
+ int i;
+
+ cpus->nr = nr;
+ for (i = 0; i < nr; i++)
+ cpus->map[i] = -1;
+
+ refcount_set(&cpus->refcnt, 1);
+ }
+
+ return cpus;
+}
+
+void cpu_aggr_map__delete(struct cpu_aggr_map *map)
+{
+ if (map) {
+ WARN_ONCE(refcount_read(&map->refcnt) != 0,
+ "cpu_aggr_map refcnt unbalanced\n");
+ free(map);
+ }
+}
+
+void cpu_aggr_map__put(struct cpu_aggr_map *map)
+{
+ if (map && refcount_dec_and_test(&map->refcnt))
+ cpu_aggr_map__delete(map);
+}
+
static int cpu__get_topology_int(int cpu, const char *name, int *value)
{
char path[PATH_MAX];
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index b8c2288a3f6d..ab6be8ef696f 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -11,9 +11,19 @@ struct aggr_cpu_id {
int id;
};
+struct cpu_aggr_map {
+ refcount_t refcnt;
+ int nr;
+ int 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);
+void cpu_aggr_map__delete(struct cpu_aggr_map *map);
+void cpu_aggr_map__put(struct cpu_aggr_map *map);
+
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);
size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size);
--
2.28.0
next prev parent reply other threads:[~2020-11-13 17:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 17:26 [PATCH 00/13 v4] perf tools: fix perf stat with large socket IDs James Clark
2020-11-13 17:26 ` [PATCH 01/13 v4] perf tools: Improve topology test James Clark
2020-11-13 17:26 ` [PATCH 02/13 v4] perf tools: Use allocator for perf_cpu_map James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:50 ` James Clark
2020-11-13 17:26 ` [PATCH 03/13 v4] perf tools: Add new struct for cpu aggregation James Clark
2020-11-13 17:26 ` [PATCH 04/13 v4] perf tools: Replace aggregation ID with a struct James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:51 ` James Clark
2020-11-13 17:26 ` James Clark [this message]
2020-11-13 17:26 ` [PATCH 06/13 v4] perf tools: drop in cpu_aggr_map struct James Clark
2020-11-13 17:26 ` [PATCH 07/13 v4] perf tools: restrict visibility of functions James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:52 ` James Clark
2020-11-13 17:26 ` [PATCH 08/13 v4] perf tools: Start using cpu_aggr_id in map James Clark
2020-11-13 17:26 ` [PATCH 09/13 v4] perf tools: Add separate node member James Clark
2020-11-13 17:26 ` [PATCH 10/13 v4] perf tools: Add separate socket member James Clark
2020-11-13 17:26 ` [PATCH 11/13 v4] perf tools: Add separate die member James Clark
2020-11-13 17:26 ` [PATCH 12/13 v4] perf tools: Add separate core member James Clark
2020-11-13 17:26 ` [PATCH 13/13 v4] perf tools: add thread field James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:53 ` James Clark
2020-11-15 21:18 ` [PATCH 00/13 v4] perf tools: fix perf stat with large socket IDs Jiri Olsa
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=20201113172654.989-6-james.clark@arm.com \
--to=james.clark@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tmricht@linux.ibm.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;
as well as URLs for NNTP newsgroup(s).