[tip:perf/core] perf test shell: Move vfs_getname probe function to lib

From: tip-bot for Arnaldo Carvalho de Melo
Date: Mon Aug 14 2017 - 13:49:56 EST


Commit-ID: 5ce669a59503f7c05c4648c70fe72bbe42613743
Gitweb: http://git.kernel.org/tip/5ce669a59503f7c05c4648c70fe72bbe42613743
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Fri, 4 Aug 2017 14:18:29 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
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 <adrian.hunter@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Michael Petlan <mpetlan@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Thomas Richter <tmricht@xxxxxxxxxxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-48xagvozhouhyi8fjota6o2d@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
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 <acme@xxxxxxxxxx>, 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 <acme@xxxxxxxxxx>, 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=$?