From 7ee5743404e3641f3c11792761632a5a7d583587 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 14 Jul 2017 15:16:54 -0300 Subject: perf trace beauty: Give syscall return beautifier more context We need the current thread and the trace internal state so that we can use the fd beautifier to augment syscall returns, so use struct syscall_arg with some fields that make sense on returns (val, thread, trace). Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-lqag8e86ybidrh5zpqne05ov@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tools/perf/builtin-trace.c') diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index d48981c36b70..cfa8bf1cca43 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -918,7 +918,7 @@ struct thread_trace { unsigned long pfmaj, pfmin; char *entry_str; double runtime_ms; - size_t (*ret_scnprintf)(unsigned long value, char *bf, size_t size); + size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg *arg); struct { unsigned long ptr; short int entry_str_pos; @@ -971,7 +971,7 @@ fail: void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, - size_t (*ret_scnprintf)(unsigned long val, char *bf, size_t size)) + size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg *arg)) { struct thread_trace *ttrace = thread__priv(arg->thread); @@ -1726,7 +1726,12 @@ signed_print: fprintf(trace->output, ") = 0 Timeout"); else if (ttrace->ret_scnprintf) { char bf[1024]; - ttrace->ret_scnprintf(ret, bf, sizeof(bf)); + struct syscall_arg arg = { + .val = ret, + .thread = thread, + .trace = trace, + }; + ttrace->ret_scnprintf(bf, sizeof(bf), &arg); ttrace->ret_scnprintf = NULL; fprintf(trace->output, ") = %s", bf); } else if (sc->fmt->hexret) -- cgit v1.2.3