perf trace: Introduce syscall__augmented_args() method
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 8a041f86a83f9783ba23a423a2d5a51b48136850 Gitweb: https://git.kernel.org/tip/8a041f86a83f9783ba23a423a2d5a51b48136850 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 3 Sep 2018 16:07:53 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 3 Sep 2018 16:07:53 -0300
perf trace: Introduce syscall__augmented_args() method
That will be used by trace__sys_enter when we start combining the augmented syscalls:sys_enter_FOO + syscalls:sys_exit_FOO.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/perf/builtin-trace.c +12 -4
@@ -1677,6 +1677,17 @@ static int trace__fprintf_sample(struct trace *trace, struct perf_evsel *evsel,return printed; } +static void *syscall__augmented_args (struct syscall *sc,struct perf_sample *sample,int *augmented_args_size) +{ +void *augmented_args =NULL ; + + *augmented_args_size = sample->raw_size - sc->args_size; +if (*augmented_args_size >0 ) + augmented_args = sample->raw_data + sc->args_size; + +return augmented_args; +} +static int trace__sys_enter (struct trace *trace,struct perf_evsel *evsel,union perf_event *event__maybe_unused ,struct perf_sample *sample)
@@ -1762,10 +1773,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct perf_evsel *evse goto out_put; args =perf_evsel__sc_tp_ptr (evsel, args, sample); - augmented_args_size = sample->raw_size - sc->args_size; -if (augmented_args_size >0 ) - augmented_args = sample->raw_data + sc->args_size; - + augmented_args =syscall__augmented_args (sc, sample, &augmented_args_size);syscall__scnprintf_args (sc, msg,sizeof (msg), args, augmented_args, augmented_args_size, trace, thread);fprintf (trace->output,"%s" , msg); err =0 ;