From: "tip-bot2 for Andi Kleen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: perf/urgent] perf cpumap: Maintain cpumaps ordered and without dups
Date: Wed, 04 Dec 2019 07:53:55 -0000 [thread overview]
Message-ID: <157544603562.21853.4057591064934185705.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191121001522.180827-4-andi@firstfloor.org>
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 7074674e7338863e6404909c9761d4d3a610a379
Gitweb: https://git.kernel.org/tip/7074674e7338863e6404909c9761d4d3a610a379
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Wed, 20 Nov 2019 16:15:13 -08:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Fri, 29 Nov 2019 12:20:45 -03:00
perf cpumap: Maintain cpumaps ordered and without dups
Enforce this in _trim()
Needed for followon change.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lore.kernel.org/lkml/20191121001522.180827-4-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/lib/cpumap.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/tools/perf/lib/cpumap.c b/tools/perf/lib/cpumap.c
index 2ca1faf..d81656b 100644
--- a/tools/perf/lib/cpumap.c
+++ b/tools/perf/lib/cpumap.c
@@ -68,14 +68,28 @@ static struct perf_cpu_map *cpu_map__default_new(void)
return cpus;
}
+static int cmp_int(const void *a, const void *b)
+{
+ return *(const int *)a - *(const int*)b;
+}
+
static struct perf_cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)
{
size_t payload_size = nr_cpus * sizeof(int);
struct perf_cpu_map *cpus = malloc(sizeof(*cpus) + payload_size);
+ int i, j;
if (cpus != NULL) {
- cpus->nr = nr_cpus;
memcpy(cpus->map, tmp_cpus, payload_size);
+ qsort(cpus->map, nr_cpus, sizeof(int), cmp_int);
+ /* Remove dups */
+ j = 0;
+ for (i = 0; i < nr_cpus; i++) {
+ if (i == 0 || cpus->map[i] != cpus->map[i - 1])
+ cpus->map[j++] = cpus->map[i];
+ }
+ cpus->nr = j;
+ assert(j <= nr_cpus);
refcount_set(&cpus->refcnt, 1);
}
next prev parent reply other threads:[~2019-12-04 7:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 0:15 Optimize perf stat for large number of events/cpus Andi Kleen
2019-11-21 0:15 ` [PATCH 01/12] perf pmu: Use file system cache to optimize sysfs access Andi Kleen
2019-11-29 6:02 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 02/12] perf affinity: Add infrastructure to save/restore affinity Andi Kleen
2019-11-29 6:02 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 03/12] perf cpumap: Maintain cpumaps ordered and without dups Andi Kleen
2019-12-04 7:53 ` tip-bot2 for Andi Kleen [this message]
2019-11-21 0:15 ` [PATCH 04/12] perf evlist: Maintain evlist->all_cpus Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 05/12] perf evsel: Add iterator to iterate over events ordered by CPU Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 06/12] perf evsel: Add functions to close evsel on a CPU Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 07/12] perf stat: Use affinity for closing file descriptors Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 08/12] perf stat: Factor out open error handling Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 09/12] perf stat: Use affinity for opening events Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-12-18 9:29 ` [perf stat] cc9cdf40ae: perf-sanity-tests.Event_times.fail kernel test robot
2019-11-21 0:15 ` [PATCH 10/12] perf stat: Use affinity for reading Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 11/12] perf evsel: Add functions to enable/disable for a specific CPU Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 0:15 ` [PATCH 12/12] perf stat: Use affinity for enabling/disabling events Andi Kleen
2019-12-04 7:53 ` [tip: perf/urgent] " tip-bot2 for Andi Kleen
2019-11-21 12:47 ` Optimize perf stat for large number of events/cpus Andi Kleen
2019-11-21 14:32 ` Arnaldo Carvalho de Melo
2019-11-27 15:16 ` Arnaldo Carvalho de Melo
2019-11-27 15:43 ` Arnaldo Carvalho de Melo
2019-11-27 23:26 ` Andi Kleen
2019-11-28 0:01 ` Arnaldo Carvalho de Melo
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=157544603562.21853.4057591064934185705.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/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).