perf trace: Use perf_evsel__sc_tp_{uint,ptr} for "id"/"args" handling syscalls:*...

Now it looks just about the same as for the trace__sys_{enter,exit}.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-y59may7zx1eccnp4m3qm4u0b@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 41799596c04567e430b3cc379714dbd43e992761..7232a7302580de35b23d31d2239eb56a958dcc85 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1693,20 +1693,13 @@ out_put:
 static int trace__fprintf_sys_enter(struct trace *trace, struct perf_evsel *evsel,
                                    struct perf_sample *sample)
 {
-       struct format_field *field = perf_evsel__field(evsel, "__syscall_nr");
        struct thread_trace *ttrace;
        struct thread *thread;
-       struct syscall *sc;
+       int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1;
+       struct syscall *sc = trace__syscall_info(trace, evsel, id);
        char msg[1024];
-       int id, err = -1;
        void *args;
 
-       if (field == NULL)
-               return -1;
-
-       id = format_field__intval(field, sample, evsel->needs_swap);
-       sc = trace__syscall_info(trace, evsel, id);
-
        if (sc == NULL)
                return -1;
 
@@ -1719,7 +1712,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct perf_evsel *evse
        if (ttrace == NULL)
                goto out_put;
 
-       args = sample->raw_data + field->offset + sizeof(u64); /* skip __syscall_nr, there is where args are */
+       args = perf_evsel__sc_tp_ptr(evsel, args, sample);
        syscall__scnprintf_args(sc, msg, sizeof(msg), args, trace, thread);
        fprintf(trace->output, "%s", msg);
        err = 0;