From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935178AbdGTIqU (ORCPT ); Thu, 20 Jul 2017 04:46:20 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57773 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934375AbdGTIqR (ORCPT ); Thu, 20 Jul 2017 04:46:17 -0400 Date: Thu, 20 Jul 2017 01:44:03 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, namhyung@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: acme@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace beauty fcntl: Beautify F_[GS]ETFD arg/return value Git-Commit-ID: c2e539d287a2e7c633ad6ecb0cb6b6f13ea05125 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: c2e539d287a2e7c633ad6ecb0cb6b6f13ea05125 Gitweb: http://git.kernel.org/tip/c2e539d287a2e7c633ad6ecb0cb6b6f13ea05125 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 14 Jul 2017 14:50:52 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jul 2017 23:14:01 -0300 perf trace beauty fcntl: Beautify F_[GS]ETFD arg/return value Now it will show 0 or CLOEXEC, the only !0 value returned by the kernel for fcntl(fd, F_GETFD). And for F_SETFD: 6870.267 ( 0.004 ms): make/29812 fcntl(fd: 7, cmd: SETFD, arg: CLOEXEC) = 0 6873.805 ( 0.002 ms): make/29816 fcntl(fd: 6, cmd: SETFD, arg: CLOEXEC) = 0 77986.150 ( 0.006 ms): alsa-sink-ALC3/2042 fcntl(fd: 45, cmd: SETFD, arg: CLOEXEC) = 0 77986.271 ( 0.006 ms): alsa-sink-ALC3/2042 fcntl(fd: 23, cmd: SETFD, arg: CLOEXEC) = 0 Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-sz9dob7t4zd6m65femazpaah@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/fcntl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/perf/trace/beauty/fcntl.c b/tools/perf/trace/beauty/fcntl.c index 3456bf4..384f177 100644 --- a/tools/perf/trace/beauty/fcntl.c +++ b/tools/perf/trace/beauty/fcntl.c @@ -7,19 +7,28 @@ */ #include "trace/beauty/beauty.h" +#include #include +static size_t fcntl__scnprintf_getfd(unsigned long val, char *bf, size_t size) +{ + return scnprintf(bf, size, "%s", val ? "CLOEXEC" : "0"); +} + size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_arg *arg) { if (arg->val == F_GETFL) { syscall_arg__set_ret_scnprintf(arg, open__scnprintf_flags); goto mask_arg; } + if (arg->val == F_GETFD) { + syscall_arg__set_ret_scnprintf(arg, fcntl__scnprintf_getfd); + goto mask_arg; + } /* * Some commands ignore the third fcntl argument, "arg", so mask it */ - if (arg->val == F_GETFD || - arg->val == F_GETOWN || arg->val == F_GET_SEALS || + if (arg->val == F_GETOWN || arg->val == F_GET_SEALS || arg->val == F_GETLEASE || arg->val == F_GETSIG) { mask_arg: arg->mask |= (1 << 2); @@ -32,6 +41,9 @@ size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_ar { int cmd = syscall_arg__val(arg, 1); + if (cmd == F_SETFD) + return fcntl__scnprintf_getfd(arg->val, bf, size); + if (cmd == F_SETFL) return open__scnprintf_flags(arg->val, bf, size); /*