perf stat aggregation: Add separate die member

[linux-2.6-microblaze.git] / tools / perf / util / cpumap.h

diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index ebd65c4..51bbe1e 100644 (file)
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -9,12 +9,15 @@
 
 struct aggr_cpu_id {
        int id;
+       int node;
+       int socket;
+       int die;
 };
 
 struct cpu_aggr_map {
        refcount_t refcnt;
        int nr;
-       int map[];
+       struct aggr_cpu_id map[];
 };
 
 struct perf_record_cpu_map_data;
@@ -34,10 +37,10 @@ int cpu_map__get_core_id(int cpu);
 struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data);
 int cpu_map__get_node_id(int cpu);
 struct aggr_cpu_id  cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data);
-int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct perf_cpu_map **sockp);
-int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct perf_cpu_map **diep);
-int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct perf_cpu_map **corep);
-int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct perf_cpu_map **nodep);
+int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp);
+int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep);
+int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep);
+int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **nodep);
 const struct perf_cpu_map *cpu_map__online(void); /* thread unsafe */
 
 static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)
@@ -47,16 +50,6 @@ static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)
        return sock->map[s];
 }
 
-static inline int cpu_map__id_to_socket(int id)
-{
-       return id >> 24;
-}
-
-static inline int cpu_map__id_to_die(int id)
-{
-       return (id >> 16) & 0xff;
-}
-
 static inline int cpu_map__id_to_cpu(int id)
 {
        return id & 0xffff;
@@ -69,7 +62,7 @@ int cpu__max_cpu(void);
 int cpu__max_present_cpu(void);
 int cpu__get_node(int cpu);
 
-int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,
+int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
                       struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data),
                       void *data);