1 files changed, 14 insertions, 8 deletions

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index e3776f5c2e01..b09b12e0976b 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -20,12 +20,15 @@
 #include <sys/param.h>
 #include "debug.h"
 #include "builtin.h"
+#include <subcmd/pager.h>
 #include <subcmd/parse-options.h>
+#include "map_symbol.h"
 #include "mem-events.h"
 #include "session.h"
 #include "hist.h"
 #include "sort.h"
 #include "tool.h"
+#include "cacheline.h"
 #include "data.h"
 #include "event.h"
 #include "evlist.h"
@@ -34,6 +37,9 @@
 #include "thread.h"
 #include "mem2node.h"
 #include "symbol.h"
+#include "ui/ui.h"
+#include "ui/progress.h"
+#include "../perf.h"
 
 struct c2c_hists {
         struct hists            hists;
@@ -248,7 +254,7 @@ static void compute_stats(struct c2c_hist_entry *c2c_he,
 static int process_sample_event(struct perf_tool *tool __maybe_unused,
                                 union perf_event *event,
                                 struct perf_sample *sample,
-                                struct perf_evsel *evsel,
+                                struct evsel *evsel,
                                 struct machine *machine)
 {
         struct c2c_hists *c2c_hists = &c2c.hists;
@@ -1106,7 +1112,7 @@ node_entry(struct perf_hpp_fmt *fmt __maybe_unused, struct perf_hpp *hpp,
                         break;
                 case 1:
                 {
-                        int num = bitmap_weight(c2c_he->cpuset, c2c.cpus_cnt);
+                        int num = bitmap_weight(set, c2c.cpus_cnt);
                         struct c2c_stats *stats = &c2c_he->node_stats[node];
 
                         ret = scnprintf(hpp->buf, hpp->size, "%2d{%2d ", node, num);
@@ -2027,7 +2033,7 @@ static int setup_nodes(struct perf_session *session)
                 c2c.node_info = 2;
 
         c2c.nodes_cnt = session->header.env.nr_numa_nodes;
-        c2c.cpus_cnt  = session->header.env.nr_cpus_online;
+        c2c.cpus_cnt  = session->header.env.nr_cpus_avail;
 
         n = session->header.env.numa_nodes;
         if (!n)
@@ -2049,7 +2055,7 @@ static int setup_nodes(struct perf_session *session)
         c2c.cpu2node = cpu2node;
 
         for (node = 0; node < c2c.nodes_cnt; node++) {
-                struct cpu_map *map = n[node].map;
+                struct perf_cpu_map *map = n[node].map;
                 unsigned long *set;
 
                 set = bitmap_alloc(c2c.cpus_cnt);
@@ -2059,7 +2065,7 @@ static int setup_nodes(struct perf_session *session)
                 nodes[node] = set;
 
                 /* empty node, skip */
-                if (cpu_map__empty(map))
+                if (perf_cpu_map__empty(map))
                         continue;
 
                 for (cpu = 0; cpu < map->nr; cpu++) {
@@ -2236,8 +2242,8 @@ static void print_pareto(FILE *out)
 
 static void print_c2c_info(FILE *out, struct perf_session *session)
 {
-        struct perf_evlist *evlist = session->evlist;
-        struct perf_evsel *evsel;
+        struct evlist *evlist = session->evlist;
+        struct evsel *evsel;
         bool first = true;
 
         fprintf(out, "=================================================\n");
@@ -2567,7 +2573,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
         return parse_callchain_report_opt(arg);
 }
 
-static int setup_callchain(struct perf_evlist *evlist)
+static int setup_callchain(struct evlist *evlist)
 {
         u64 sample_type = perf_evlist__combined_sample_type(evlist);
         enum perf_call_graph_mode mode = CALLCHAIN_NONE;