From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935260AbdGTItC (ORCPT ); Thu, 20 Jul 2017 04:49:02 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57197 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934767AbdGTIrR (ORCPT ); Thu, 20 Jul 2017 04:47:17 -0400 Date: Thu, 20 Jul 2017 01:45:04 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org Reply-To: acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, namhyung@kernel.org, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace beauty fcntl: Augment the return of F_DUPFD(_CLOEXEC) Git-Commit-ID: 07a0572439450e2631f90d595965c379de105bab 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: 07a0572439450e2631f90d595965c379de105bab Gitweb: http://git.kernel.org/tip/07a0572439450e2631f90d595965c379de105bab Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 14 Jul 2017 15:24:19 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jul 2017 23:14:03 -0300 perf trace beauty fcntl: Augment the return of F_DUPFD(_CLOEXEC) Using the existing 'fd' beautifier, now we can see the path for the just dup'ed fd: 18031.338 ( 0.009 ms): gnome-terminal/2472 fcntl(fd: 55, cmd: DUPFD_CLOEXEC) = 56 Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-z0ggo126p2eobfwnjw9z16tw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/fcntl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/trace/beauty/fcntl.c b/tools/perf/trace/beauty/fcntl.c index 9de80a7..254ae435 100644 --- a/tools/perf/trace/beauty/fcntl.c +++ b/tools/perf/trace/beauty/fcntl.c @@ -30,6 +30,10 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_ar syscall_arg__set_ret_scnprintf(arg, syscall_arg__scnprintf_fcntl_getfd); goto mask_arg; } + if (arg->val == F_DUPFD_CLOEXEC || arg->val == F_DUPFD) { + syscall_arg__set_ret_scnprintf(arg, syscall_arg__scnprintf_fd); + goto out; + } /* * Some commands ignore the third fcntl argument, "arg", so mask it */ @@ -38,7 +42,7 @@ size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_ar mask_arg: arg->mask |= (1 << 2); } - +out: return syscall_arg__scnprintf_strarrays(bf, size, arg); }