perf cpumap: Drop in cpu_aggr_map struct

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

diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index 9979b4b..b536973 100644 (file)
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/resource.h>
+#include "cpumap.h"
 #include "rblist.h"
 
 struct perf_cpu_map;
@@ -99,7 +100,7 @@ struct runtime_stat {
        struct rblist value_list;
 };
 
-typedef int (*aggr_get_id_t)(struct perf_stat_config *config,
+typedef struct aggr_cpu_id (*aggr_get_id_t)(struct perf_stat_config *config,
                             struct perf_cpu_map *m, int cpu);
 
 struct perf_stat_config {
@@ -138,9 +139,9 @@ struct perf_stat_config {
        const char              *csv_sep;
        struct stats            *walltime_nsecs_stats;
        struct rusage            ru_data;
-       struct perf_cpu_map             *aggr_map;
+       struct cpu_aggr_map     *aggr_map;
        aggr_get_id_t            aggr_get_id;
-       struct perf_cpu_map             *cpus_aggr_map;
+       struct cpu_aggr_map     *cpus_aggr_map;
        u64                     *walltime_run;
        struct rblist            metric_events;
        int                      ctl_fd;
@@ -170,7 +171,7 @@ struct evlist;
 
 struct perf_aggr_thread_value {
        struct evsel *counter;
-       int id;
+       struct aggr_cpu_id id;
        double uval;
        u64 val;
        u64 run;