From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751826AbdGZRS1 (ORCPT ); Wed, 26 Jul 2017 13:18:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34039 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751526AbdGZRSX (ORCPT ); Wed, 26 Jul 2017 13:18:23 -0400 Date: Wed, 26 Jul 2017 10:16:11 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, wangnan0@huawei.com Reply-To: acme@redhat.com, wangnan0@huawei.com, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Allow specifying names to syscall arguments formatters Git-Commit-ID: c51bdfecd782eec710237c53137e0fefd032d287 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c51bdfecd782eec710237c53137e0fefd032d287 Gitweb: http://git.kernel.org/tip/c51bdfecd782eec710237c53137e0fefd032d287 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 19 Jul 2017 15:47:30 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 20 Jul 2017 09:55:53 -0300 perf trace: Allow specifying names to syscall arguments formatters For tracepointless syscalls, like clone, otherwise get them from the tracepoint's /format file. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ml5qvv1w5k96ghwhxpzzsmm3@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e1988d0..6664293 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -604,6 +604,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, struct syscall_arg_fmt { size_t (*scnprintf)(char *bf, size_t size, struct syscall_arg *arg); void *parm; + const char *name; bool show_zero; }; @@ -1349,6 +1350,15 @@ unsigned long syscall_arg__val(struct syscall_arg *arg, u8 idx) return val; } +static size_t syscall__scnprintf_name(struct syscall *sc, char *bf, size_t size, + struct syscall_arg *arg) +{ + if (sc->arg_fmt && sc->arg_fmt[arg->idx].name) + return scnprintf(bf, size, "%s: ", sc->arg_fmt[arg->idx].name); + + return scnprintf(bf, size, "arg%d: ", arg->idx); +} + static size_t syscall__scnprintf_val(struct syscall *sc, char *bf, size_t size, struct syscall_arg *arg, unsigned long val) { @@ -1421,8 +1431,9 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, if (arg.mask & bit) goto next_arg; val = syscall_arg__val(&arg, arg.idx); - printed += scnprintf(bf + printed, size - printed, - "%sarg%d: ", printed ? ", " : "", arg.idx); + if (printed) + printed += scnprintf(bf + printed, size - printed, ", "); + printed += syscall__scnprintf_name(sc, bf + printed, size - printed, &arg); printed += syscall__scnprintf_val(sc, bf + printed, size - printed, &arg, val); next_arg: ++arg.idx;