Commit 86ee6e18 authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo

perf stat: Refactor aggregation code

Refactor aggregation code by introducing a single aggr_mode variable and an
enum for aggregation.

Also refactor cpumap code having to do with cpu to socket mappings. All in
preparation for extended modes, such as cpu -> core.

Also fix socket aggregation and ensure that sockets are printed in increasing
order.
Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1360846649-6411-2-git-send-email-eranian@google.com
[ committer note: Fixup conflicts with a7e191c3 "--repeat forever" and
  acf28922 "Use perf_evlist__prepare/start_workload()" ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ebf3c675
This diff is collapsed.
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "cpumap.h" #include "cpumap.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
static struct cpu_map *cpu_map__default_new(void) static struct cpu_map *cpu_map__default_new(void)
{ {
...@@ -219,7 +220,7 @@ int cpu_map__get_socket(struct cpu_map *map, int idx) ...@@ -219,7 +220,7 @@ int cpu_map__get_socket(struct cpu_map *map, int idx)
if (!mnt) if (!mnt)
return -1; return -1;
sprintf(path, snprintf(path, PATH_MAX,
"%s/devices/system/cpu/cpu%d/topology/physical_package_id", "%s/devices/system/cpu/cpu%d/topology/physical_package_id",
mnt, cpu); mnt, cpu);
...@@ -231,27 +232,42 @@ int cpu_map__get_socket(struct cpu_map *map, int idx) ...@@ -231,27 +232,42 @@ int cpu_map__get_socket(struct cpu_map *map, int idx)
return ret == 1 ? cpu : -1; return ret == 1 ? cpu : -1;
} }
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp) static int cmp_ids(const void *a, const void *b)
{ {
struct cpu_map *sock; return *(int *)a - *(int *)b;
}
static int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
int (*f)(struct cpu_map *map, int cpu))
{
struct cpu_map *c;
int nr = cpus->nr; int nr = cpus->nr;
int cpu, s1, s2; int cpu, s1, s2;
sock = calloc(1, sizeof(*sock) + nr * sizeof(int)); /* allocate as much as possible */
if (!sock) c = calloc(1, sizeof(*c) + nr * sizeof(int));
if (!c)
return -1; return -1;
for (cpu = 0; cpu < nr; cpu++) { for (cpu = 0; cpu < nr; cpu++) {
s1 = cpu_map__get_socket(cpus, cpu); s1 = f(cpus, cpu);
for (s2 = 0; s2 < sock->nr; s2++) { for (s2 = 0; s2 < c->nr; s2++) {
if (s1 == sock->map[s2]) if (s1 == c->map[s2])
break; break;
} }
if (s2 == sock->nr) { if (s2 == c->nr) {
sock->map[sock->nr] = s1; c->map[c->nr] = s1;
sock->nr++; c->nr++;
} }
} }
*sockp = sock; /* ensure we process id in increasing order */
qsort(c->map, c->nr, sizeof(int), cmp_ids);
*res = c;
return 0; return 0;
} }
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp)
{
return cpu_map__build_map(cpus, sockp, cpu_map__get_socket);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment