perf evlist: Use the right prefix for 'struct evlist' mmap pages parsing method

[linux-2.6-microblaze.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 7c64134..3673c04 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -641,12 +641,9 @@ repeat:
                hists->uid_filter_str = top->record_opts.target.uid_str;
        }
 
-       ret = perf_evlist__tui_browse_hists(top->evlist, help, &hbt,
-                                     top->min_percent,
-                                     &top->session->header.env,
-                                     !top->record_opts.overwrite,
-                                     &top->annotation_opts);
-
+       ret = evlist__tui_browse_hists(top->evlist, help, &hbt, top->min_percent,
+                                      &top->session->header.env, !top->record_opts.overwrite,
+                                      &top->annotation_opts);
        if (ret == K_RELOAD) {
                top->zero = true;
                goto repeat;
@@ -782,7 +779,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
        if (!machine->kptr_restrict_warned &&
            symbol_conf.kptr_restrict &&
            al.cpumode == PERF_RECORD_MISC_KERNEL) {
-               if (!perf_evlist__exclude_kernel(top->session->evlist)) {
+               if (!evlist__exclude_kernel(top->session->evlist)) {
                        ui__warning(
 "Kernel address maps (/proc/{kallsyms,modules}) are restricted.\n\n"
 "Check /proc/sys/kernel/kptr_restrict and /proc/sys/kernel/perf_event_paranoid.\n\n"
@@ -890,7 +887,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
        while ((event = perf_mmap__read_event(&md->core)) != NULL) {
                int ret;
 
-               ret = perf_evlist__parse_sample_timestamp(evlist, event, &last_timestamp);
+               ret = evlist__parse_sample_timestamp(evlist, event, &last_timestamp);
                if (ret && ret != -1)
                        break;
 
@@ -918,14 +915,14 @@ static void perf_top__mmap_read(struct perf_top *top)
        int i;
 
        if (overwrite)
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING);
 
        for (i = 0; i < top->evlist->core.nr_mmaps; i++)
                perf_top__mmap_read_idx(top, i);
 
        if (overwrite) {
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
        }
 }
 
@@ -1025,7 +1022,7 @@ static int perf_top__start_counters(struct perf_top *top)
                goto out_err;
        }
 
-       perf_evlist__config(evlist, opts, &callchain_param);
+       evlist__config(evlist, opts, &callchain_param);
 
        evlist__for_each_entry(evlist, counter) {
 try_again:
@@ -1153,13 +1150,13 @@ static int deliver_event(struct ordered_events *qe,
                return 0;
        }
 
-       ret = perf_evlist__parse_sample(evlist, event, &sample);
+       ret = evlist__parse_sample(evlist, event, &sample);
        if (ret) {
                pr_err("Can't parse sample, err = %d\n", ret);
                goto next_event;
        }
 
-       evsel = perf_evlist__id2evsel(session->evlist, sample.id);
+       evsel = evlist__id2evsel(session->evlist, sample.id);
        assert(evsel != NULL);
 
        if (event->header.type == PERF_RECORD_SAMPLE) {
@@ -1469,8 +1466,7 @@ int cmd_top(int argc, const char **argv)
        OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols,
                    "hide kernel symbols"),
        OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages",
-                    "number of mmap data pages",
-                    perf_evlist__parse_mmap_pages),
+                    "number of mmap data pages", evlist__parse_mmap_pages),
        OPT_INTEGER('r', "realtime", &top.realtime_prio,
                    "collect data with this RT SCHED_FIFO priority"),
        OPT_INTEGER('d', "delay", &top.delay_secs,
@@ -1697,7 +1693,7 @@ int cmd_top(int argc, const char **argv)
        if (target__none(target))
                target->system_wide = true;
 
-       if (perf_evlist__create_maps(top.evlist, target) < 0) {
+       if (evlist__create_maps(top.evlist, target) < 0) {
                ui__error("Couldn't create thread/CPU maps: %s\n",
                          errno == ENOENT ? "No such process" : str_error_r(errno, errbuf, sizeof(errbuf)));
                goto out_delete_evlist;
@@ -1762,7 +1758,7 @@ int cmd_top(int argc, const char **argv)
        }
 #endif
 
-       if (perf_evlist__start_sb_thread(top.sb_evlist, target)) {
+       if (evlist__start_sb_thread(top.sb_evlist, target)) {
                pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
                opts->no_bpf_event = true;
        }
@@ -1770,7 +1766,7 @@ int cmd_top(int argc, const char **argv)
        status = __cmd_top(&top);
 
        if (!opts->no_bpf_event)
-               perf_evlist__stop_sb_thread(top.sb_evlist);
+               evlist__stop_sb_thread(top.sb_evlist);
 
 out_delete_evlist:
        evlist__delete(top.evlist);