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 v5 02/12] perf tools: Use allocator for perf_cpu_map
Date: Tue, 17 Nov 2020 16:48:35 +0200 [thread overview]
Message-ID: <20201117144845.13714-3-james.clark@arm.com> (raw)
In-Reply-To: <20201117144845.13714-1-james.clark@arm.com>
Use the existing allocator for perf_cpu_map to avoid use
of raw malloc. This could cause an issue in later commits
where the size of perf_cpu_map is changed.
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index dc5c5e6fc502..20e3a75953fc 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -132,15 +132,16 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,
int (*f)(struct perf_cpu_map *map, int cpu, void *data),
void *data)
{
- struct perf_cpu_map *c;
int nr = cpus->nr;
+ struct perf_cpu_map *c = perf_cpu_map__empty_new(nr);
int cpu, s1, s2;
- /* allocate as much as possible */
- c = calloc(1, sizeof(*c) + nr * sizeof(int));
if (!c)
return -1;
+ /* Reset size as it may only be partially filled */
+ c->nr = 0;
+
for (cpu = 0; cpu < nr; cpu++) {
s1 = f(cpus, cpu, data);
for (s2 = 0; s2 < c->nr; s2++) {
@@ -155,7 +156,6 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,
/* ensure we process id in increasing order */
qsort(c->map, c->nr, sizeof(int), cmp_ids);
- refcount_set(&c->refcnt, 1);
*res = c;
return 0;
}
--
2.28.0
next prev parent reply other threads:[~2020-11-17 14:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 14:48 [PATCH v5 00/12] perf tools: fix perf stat with large socket IDs James Clark
2020-11-17 14:48 ` [PATCH v5 01/12] perf tools: Improve topology test James Clark
2020-11-18 11:21 ` Namhyung Kim
2020-11-26 13:46 ` James Clark
2020-11-17 14:48 ` James Clark [this message]
2020-11-17 14:48 ` [PATCH v5 03/12] perf tools: Add new struct for cpu aggregation James Clark
2020-11-17 14:48 ` [PATCH v5 04/12] perf tools: Replace aggregation ID with a struct James Clark
2020-11-17 14:48 ` [PATCH v5 05/12] perf tools: add new map type for aggregation James Clark
2020-11-17 14:48 ` [PATCH v5 06/12] perf tools: drop in cpu_aggr_map struct James Clark
2020-11-17 14:48 ` [PATCH v5 07/12] perf tools: Start using cpu_aggr_id in map James Clark
2020-11-17 14:48 ` [PATCH v5 08/12] perf tools: Add separate node member James Clark
2020-11-17 14:48 ` [PATCH v5 09/12] perf tools: Add separate socket member James Clark
2020-11-17 14:48 ` [PATCH v5 10/12] perf tools: Add separate die member James Clark
2020-11-17 14:48 ` [PATCH v5 11/12] perf tools: Add separate core member James Clark
2020-11-17 14:48 ` [PATCH v5 12/12] perf tools: Add separate thread member James Clark
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=20201117144845.13714-3-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).