perf test shell: Move vfs_getname probe function to lib

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Aug 14, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-08-14 17:49 UTC #0 lore raw

Commit-ID:  5ce669a59503f7c05c4648c70fe72bbe42613743
Gitweb:     http://git.kernel.org/tip/5ce669a59503f7c05c4648c70fe72bbe42613743
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 4 Aug 2017 14:18:29 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Michael Petlan <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Thomas Richter <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 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(-)

tools/perf/Makefile.perf +3 -1

index eb13567..70ddc65 100644
@@ -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

tools/perf/tests/shell/lib/probe_vfs_getname.sh renamed from tools/perf/tests/shell/probe_vfs_getname.sh +4 -6

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
@@ -1,5 +1,3 @@
-# Add vfs_getname probe to get syscall args filenames
-#
 # Arnaldo Carvalho de Melo <[email protected]>, 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
+}

tools/perf/tests/shell/probe_vfs_getname.sh +1 ~~-21~~

index d5f5248..c838013 100755
@@ -2,27 +2,7 @@
 #
 # Arnaldo Carvalho de Melo <[email protected]>, 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=$?