Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping

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

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index de80534..85b6a46 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3105,7 +3105,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st
                return;
        }
 
-       evsel = perf_evlist__id2evsel(trace->evlist, sample->id);
+       evsel = evlist__id2evsel(trace->evlist, sample->id);
        if (evsel == NULL) {
                fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample->id);
                return;
@@ -3666,7 +3666,7 @@ static int trace__set_filter_loop_pids(struct trace *trace)
                thread = parent;
        }
 
-       err = perf_evlist__append_tp_filter_pids(trace->evlist, nr, pids);
+       err = evlist__append_tp_filter_pids(trace->evlist, nr, pids);
        if (!err && trace->filter_pids.map)
                err = bpf_map__set_filter_pids(trace->filter_pids.map, nr, pids);
 
@@ -3680,11 +3680,11 @@ static int trace__set_filter_pids(struct trace *trace)
         * Better not use !target__has_task() here because we need to cover the
         * case where no threads were specified in the command line, but a
         * workload was, and in that case we will fill in the thread_map when
-        * we fork the workload in perf_evlist__prepare_workload.
+        * we fork the workload in evlist__prepare_workload.
         */
        if (trace->filter_pids.nr > 0) {
-               err = perf_evlist__append_tp_filter_pids(trace->evlist, trace->filter_pids.nr,
-                                                        trace->filter_pids.entries);
+               err = evlist__append_tp_filter_pids(trace->evlist, trace->filter_pids.nr,
+                                                   trace->filter_pids.entries);
                if (!err && trace->filter_pids.map) {
                        err = bpf_map__set_filter_pids(trace->filter_pids.map, trace->filter_pids.nr,
                                                       trace->filter_pids.entries);
@@ -3700,9 +3700,8 @@ static int __trace__deliver_event(struct trace *trace, union perf_event *event)
 {
        struct evlist *evlist = trace->evlist;
        struct perf_sample sample;
-       int err;
+       int err = evlist__parse_sample(evlist, event, &sample);
 
-       err = perf_evlist__parse_sample(evlist, event, &sample);
        if (err)
                fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);
        else
@@ -3735,7 +3734,7 @@ static int trace__deliver_event(struct trace *trace, union perf_event *event)
        if (!trace->sort_events)
                return __trace__deliver_event(trace, event);
 
-       err = perf_evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);
+       err = evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);
        if (err && err != -1)
                return err;
 
@@ -3951,7 +3950,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
        if (trace->cgroup)
                evlist__set_default_cgroup(trace->evlist, trace->cgroup);
 
-       err = perf_evlist__create_maps(evlist, &trace->opts.target);
+       err = evlist__create_maps(evlist, &trace->opts.target);
        if (err < 0) {
                fprintf(trace->output, "Problems parsing the target to trace, check your options!\n");
                goto out_delete_evlist;
@@ -3963,14 +3962,13 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
                goto out_delete_evlist;
        }
 
-       perf_evlist__config(evlist, &trace->opts, &callchain_param);
+       evlist__config(evlist, &trace->opts, &callchain_param);
 
        signal(SIGCHLD, sig_handler);
        signal(SIGINT, sig_handler);
 
        if (forks) {
-               err = perf_evlist__prepare_workload(evlist, &trace->opts.target,
-                                                   argv, false, NULL);
+               err = evlist__prepare_workload(evlist, &trace->opts.target, argv, false, NULL);
                if (err < 0) {
                        fprintf(trace->output, "Couldn't run the workload!\n");
                        goto out_delete_evlist;
@@ -4028,7 +4026,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
        err = trace__expand_filters(trace, &evsel);
        if (err)
                goto out_delete_evlist;
-       err = perf_evlist__apply_filters(evlist, &evsel);
+       err = evlist__apply_filters(evlist, &evsel);
        if (err < 0)
                goto out_error_apply_filters;
 
@@ -4043,7 +4041,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
                evlist__enable(evlist);
 
        if (forks)
-               perf_evlist__start_workload(evlist);
+               evlist__start_workload(evlist);
 
        if (trace->opts.initial_delay) {
                usleep(trace->opts.initial_delay * 1000);
@@ -4229,12 +4227,10 @@ static int trace__replay(struct trace *trace)
        if (err)
                goto out;
 
-       evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
-                                                    "raw_syscalls:sys_enter");
+       evsel = evlist__find_tracepoint_by_name(session->evlist, "raw_syscalls:sys_enter");
        /* older kernels have syscalls tp versus raw_syscalls */
        if (evsel == NULL)
-               evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
-                                                            "syscalls:sys_enter");
+               evsel = evlist__find_tracepoint_by_name(session->evlist, "syscalls:sys_enter");
 
        if (evsel &&
            (evsel__init_raw_syscall_tp(evsel, trace__sys_enter) < 0 ||
@@ -4243,11 +4239,9 @@ static int trace__replay(struct trace *trace)
                goto out;
        }
 
-       evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
-                                                    "raw_syscalls:sys_exit");
+       evsel = evlist__find_tracepoint_by_name(session->evlist, "raw_syscalls:sys_exit");
        if (evsel == NULL)
-               evsel = perf_evlist__find_tracepoint_by_name(session->evlist,
-                                                            "syscalls:sys_exit");
+               evsel = evlist__find_tracepoint_by_name(session->evlist, "syscalls:sys_exit");
        if (evsel &&
            (evsel__init_raw_syscall_tp(evsel, trace__sys_exit) < 0 ||
            perf_evsel__init_sc_tp_uint_field(evsel, ret))) {
@@ -4769,8 +4763,7 @@ int cmd_trace(int argc, const char **argv)
        OPT_BOOLEAN(0, "no-inherit", &trace.opts.no_inherit,
                    "child tasks do not inherit counters"),
        OPT_CALLBACK('m', "mmap-pages", &trace.opts.mmap_pages, "pages",
-                    "number of mmap data pages",
-                    perf_evlist__parse_mmap_pages),
+                    "number of mmap data pages", evlist__parse_mmap_pages),
        OPT_STRING('u', "uid", &trace.opts.target.uid_str, "user",
                   "user to profile"),
        OPT_CALLBACK(0, "duration", &trace, "float",
@@ -4907,7 +4900,7 @@ int cmd_trace(int argc, const char **argv)
        if (evsel) {
                trace.syscalls.events.augmented = evsel;
 
-               evsel = perf_evlist__find_tracepoint_by_name(trace.evlist, "raw_syscalls:sys_enter");
+               evsel = evlist__find_tracepoint_by_name(trace.evlist, "raw_syscalls:sys_enter");
                if (evsel == NULL) {
                        pr_err("ERROR: raw_syscalls:sys_enter not found in the augmented BPF object\n");
                        goto out;