From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935469AbdGTI6N (ORCPT ); Thu, 20 Jul 2017 04:58:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50773 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934945AbdGTI6L (ORCPT ); Thu, 20 Jul 2017 04:58:11 -0400 Date: Thu, 20 Jul 2017 01:55:57 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, hpa@zytor.com, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: wangnan0@huawei.com, hpa@zytor.com, jolsa@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace beauty fcntl: Beautify F_GETLEASE and F_SETLEASE arg/return Git-Commit-ID: 65dfa1e7799edd114fbd3949f2783f4e69fd0305 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: 65dfa1e7799edd114fbd3949f2783f4e69fd0305 Gitweb: http://git.kernel.org/tip/65dfa1e7799edd114fbd3949f2783f4e69fd0305 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 17 Jul 2017 10:46:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jul 2017 23:14:23 -0300 perf trace beauty fcntl: Beautify F_GETLEASE and F_SETLEASE arg/return One more looking prettier. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ytr7idkese8sjtvn5g60130e@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/fcntl.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/perf/trace/beauty/fcntl.c b/tools/perf/trace/beauty/fcntl.c index d082fd2..b6987c4 100644 --- a/tools/perf/trace/beauty/fcntl.c +++ b/tools/perf/trace/beauty/fcntl.c @@ -20,6 +20,19 @@ static size_t syscall_arg__scnprintf_fcntl_getfd(char *bf, size_t size, struct s return fcntl__scnprintf_getfd(arg->val, bf, size); } +static size_t fcntl__scnprintf_getlease(unsigned long val, char *bf, size_t size) +{ + static const char *fcntl_setlease[] = { "RDLCK", "WRLCK", "UNLCK", }; + static DEFINE_STRARRAY(fcntl_setlease); + + return strarray__scnprintf(&strarray__fcntl_setlease, bf, size, "%x", val); +} + +static size_t syscall_arg__scnprintf_fcntl_getlease(char *bf, size_t size, struct syscall_arg *arg) +{ + return fcntl__scnprintf_getlease(arg->val, bf, size); +} + size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_arg *arg) { if (arg->val == F_GETFL) { @@ -38,11 +51,15 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_ar syscall_arg__set_ret_scnprintf(arg, syscall_arg__scnprintf_pid); goto mask_arg; } + if (arg->val == F_GETLEASE) { + syscall_arg__set_ret_scnprintf(arg, syscall_arg__scnprintf_fcntl_getlease); + goto mask_arg; + } /* * Some commands ignore the third fcntl argument, "arg", so mask it */ if (arg->val == F_GET_SEALS || - arg->val == F_GETLEASE || arg->val == F_GETSIG) { + arg->val == F_GETSIG) { mask_arg: arg->mask |= (1 << 2); } @@ -62,6 +79,9 @@ size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_ar if (cmd == F_SETOWN) return syscall_arg__scnprintf_pid(bf, size, arg); + + if (cmd == F_SETLEASE) + return fcntl__scnprintf_getlease(arg->val, bf, size); /* * We still don't grab the contents of pointers on entry or exit, * so just print them as hex numbers