libperf: Add perf_cpu_map__get()/perf_cpu_map__put()

[linux-2.6-block.git] / tools / perf / tests / switch-tracking.c

diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index 6cdab5f4812addff90263e25db1f39b7c055f786..27af7b7109a3c9006442f49512089f806f7b8ea4 100644 (file)
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -52,8 +52,8 @@ static int spin_sleep(void)
 }
 
 struct switch_tracking {
-       struct perf_evsel *switch_evsel;
-       struct perf_evsel *cycles_evsel;
+       struct evsel *switch_evsel;
+       struct evsel *cycles_evsel;
        pid_t *tids;
        int nr_tids;
        int comm_seen[4];
@@ -113,12 +113,12 @@ static int check_cpu(struct switch_tracking *switch_tracking, int cpu)
        return 0;
 }
 
-static int process_sample_event(struct perf_evlist *evlist,
+static int process_sample_event(struct evlist *evlist,
                                union perf_event *event,
                                struct switch_tracking *switch_tracking)
 {
        struct perf_sample sample;
-       struct perf_evsel *evsel;
+       struct evsel *evsel;
        pid_t next_tid, prev_tid;
        int cpu, err;
 
@@ -163,7 +163,7 @@ static int process_sample_event(struct perf_evlist *evlist,
        return 0;
 }
 
-static int process_event(struct perf_evlist *evlist, union perf_event *event,
+static int process_event(struct evlist *evlist, union perf_event *event,
                         struct switch_tracking *switch_tracking)
 {
        if (event->header.type == PERF_RECORD_SAMPLE)
@@ -203,7 +203,7 @@ struct event_node {
        u64 event_time;
 };
 
-static int add_event(struct perf_evlist *evlist, struct list_head *events,
+static int add_event(struct evlist *evlist, struct list_head *events,
                     union perf_event *event)
 {
        struct perf_sample sample;
@@ -252,7 +252,7 @@ static int compar(const void *a, const void *b)
        return cmp;
 }
 
-static int process_events(struct perf_evlist *evlist,
+static int process_events(struct evlist *evlist,
                          struct switch_tracking *switch_tracking)
 {
        union perf_event *event;
@@ -327,11 +327,11 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                        .uses_mmap   = true,
                },
        };
-       struct thread_map *threads = NULL;
-       struct cpu_map *cpus = NULL;
-       struct perf_evlist *evlist = NULL;
-       struct perf_evsel *evsel, *cpu_clocks_evsel, *cycles_evsel;
-       struct perf_evsel *switch_evsel, *tracking_evsel;
+       struct perf_thread_map *threads = NULL;
+       struct perf_cpu_map *cpus = NULL;
+       struct evlist *evlist = NULL;
+       struct evsel *evsel, *cpu_clocks_evsel, *cycles_evsel;
+       struct evsel *switch_evsel, *tracking_evsel;
        const char *comm;
        int err = -1;
 
@@ -347,9 +347,9 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       evlist = perf_evlist__new();
+       evlist = evlist__new();
        if (!evlist) {
-               pr_debug("perf_evlist__new failed!\n");
+               pr_debug("evlist__new failed!\n");
                goto out_err;
        }
 
@@ -450,7 +450,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                }
        }
 
-       if (perf_evlist__open(evlist) < 0) {
+       if (evlist__open(evlist) < 0) {
                pr_debug("Not supported\n");
                err = 0;
                goto out;
@@ -462,9 +462,9 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       perf_evlist__enable(evlist);
+       evlist__enable(evlist);
 
-       err = perf_evsel__disable(cpu_clocks_evsel);
+       err = evsel__disable(cpu_clocks_evsel);
        if (err) {
                pr_debug("perf_evlist__disable_event failed!\n");
                goto out_err;
@@ -483,7 +483,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       err = perf_evsel__disable(cycles_evsel);
+       err = evsel__disable(cycles_evsel);
        if (err) {
                pr_debug("perf_evlist__disable_event failed!\n");
                goto out_err;
@@ -509,7 +509,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       err = perf_evsel__enable(cycles_evsel);
+       err = evsel__enable(cycles_evsel);
        if (err) {
                pr_debug("perf_evlist__disable_event failed!\n");
                goto out_err;
@@ -528,7 +528,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       perf_evlist__disable(evlist);
+       evlist__disable(evlist);
 
        switch_tracking.switch_evsel = switch_evsel;
        switch_tracking.cycles_evsel = cycles_evsel;
@@ -566,10 +566,10 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
        }
 out:
        if (evlist) {
-               perf_evlist__disable(evlist);
-               perf_evlist__delete(evlist);
+               evlist__disable(evlist);
+               evlist__delete(evlist);
        } else {
-               cpu_map__put(cpus);
+               perf_cpu_map__put(cpus);
                thread_map__put(threads);
        }