From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752612AbdHNRtw (ORCPT ); Mon, 14 Aug 2017 13:49:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41809 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbdHNRtv (ORCPT ); Mon, 14 Aug 2017 13:49:51 -0400 Date: Mon, 14 Aug 2017 10:47:17 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, acme@redhat.com, tmricht@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, tglx@linutronix.de, mpetlan@redhat.com, wangnan0@huawei.com, hpa@zytor.com, dsahern@gmail.com Reply-To: tglx@linutronix.de, dsahern@gmail.com, wangnan0@huawei.com, hpa@zytor.com, mpetlan@redhat.com, tmricht@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, acme@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test shell: Move vfs_getname probe function to lib Git-Commit-ID: 5ce669a59503f7c05c4648c70fe72bbe42613743 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: 5ce669a59503f7c05c4648c70fe72bbe42613743 Gitweb: http://git.kernel.org/tip/5ce669a59503f7c05c4648c70fe72bbe42613743 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 4 Aug 2017 14:18:29 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 11 Aug 2017 16:06:29 -0300 perf test shell: Move vfs_getname probe function to lib Multiple tests will be able to reuse these functions, to test things like perf report, 'trace', etc, using this probe. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Michael Petlan Cc: Namhyung Kim Cc: Thomas Richter Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-48xagvozhouhyi8fjota6o2d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 4 +++- .../tests/shell/{ => lib}/probe_vfs_getname.sh | 10 ++++------ tools/perf/tests/shell/probe_vfs_getname.sh | 22 +--------------------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index eb13567..70ddc65 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -762,7 +762,9 @@ install-tests: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ - $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell' + $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ + $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' install-bin: install-tools install-tests install-traceevent-plugins diff --git a/tools/perf/tests/shell/probe_vfs_getname.sh b/tools/perf/tests/shell/lib/probe_vfs_getname.sh old mode 100755 new mode 100644 similarity index 82% copy from tools/perf/tests/shell/probe_vfs_getname.sh copy to tools/perf/tests/shell/lib/probe_vfs_getname.sh index d5f5248..4230804 --- a/tools/perf/tests/shell/probe_vfs_getname.sh +++ b/tools/perf/tests/shell/lib/probe_vfs_getname.sh @@ -1,5 +1,3 @@ -# Add vfs_getname probe to get syscall args filenames -# # Arnaldo Carvalho de Melo , 2017 perf probe -l | grep -q probe:vfs_getname @@ -24,7 +22,7 @@ skip_if_no_debuginfo() { return 1 } -add_probe_vfs_getname || skip_if_no_debuginfo -err=$? -cleanup_probe_vfs_getname -exit $err +skip_if_no_debuginfo() { + add_probe_vfs_getname -v 2>&1 | grep -q "^Failed to find the path for kernel" && return 2 + return 1 +} diff --git a/tools/perf/tests/shell/probe_vfs_getname.sh b/tools/perf/tests/shell/probe_vfs_getname.sh index d5f5248..c838013 100755 --- a/tools/perf/tests/shell/probe_vfs_getname.sh +++ b/tools/perf/tests/shell/probe_vfs_getname.sh @@ -2,27 +2,7 @@ # # Arnaldo Carvalho de Melo , 2017 -perf probe -l | grep -q probe:vfs_getname -had_vfs_getname=$? - -cleanup_probe_vfs_getname() { - if [ $had_vfs_getname -eq 1 ] ; then - perf probe -q -d probe:vfs_getname - fi -} - -add_probe_vfs_getname() { - local verbose=$1 - if [ $had_vfs_getname -eq 1 ] ; then - line=$(perf probe -L getname_flags | egrep 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/') - perf probe $verbose "vfs_getname=getname_flags:${line} pathname=result->name:string" - fi -} - -skip_if_no_debuginfo() { - add_probe_vfs_getname -v 2>&1 | grep -q "^Failed to find the path for kernel" && return 2 - return 1 -} +. $(dirname $0)/lib/probe_vfs_getname.sh add_probe_vfs_getname || skip_if_no_debuginfo err=$?