172 lines
7.0 KiB
Diff
172 lines
7.0 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 10 Oct 2010 02:20:51 +0100
|
|
Subject: [PATCH] perf: Use $PERF_EXEC_PATH in canned report scripts
|
|
|
|
Set $PERF_EXEC_PATH before starting the record and report scripts, and
|
|
make them use it where necessary.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
tools/perf/builtin-trace.c | 6 +++---
|
|
tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +-
|
|
tools/perf/scripts/perl/bin/rw-by-file-report | 2 +-
|
|
tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +-
|
|
tools/perf/scripts/perl/bin/rwtop-report | 2 +-
|
|
tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +-
|
|
tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +-
|
|
.../python/bin/failed-syscalls-by-pid-report | 2 +-
|
|
.../perf/scripts/python/bin/sched-migration-report | 2 +-
|
|
tools/perf/scripts/python/bin/sctop-report | 2 +-
|
|
.../python/bin/syscall-counts-by-pid-report | 2 +-
|
|
.../perf/scripts/python/bin/syscall-counts-report | 2 +-
|
|
12 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
|
|
index 40a6a29..3ea6219 100644
|
|
--- a/tools/perf/builtin-trace.c
|
|
+++ b/tools/perf/builtin-trace.c
|
|
@@ -46,9 +46,6 @@ static struct scripting_ops *scripting_ops;
|
|
|
|
static void setup_scripting(void)
|
|
{
|
|
- /* make sure PERF_EXEC_PATH is set for scripts */
|
|
- perf_set_argv_exec_path(perf_exec_path());
|
|
-
|
|
setup_perl_scripting();
|
|
setup_python_scripting();
|
|
|
|
@@ -593,6 +590,9 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
|
|
suffix = REPORT_SUFFIX;
|
|
}
|
|
|
|
+ /* make sure PERF_EXEC_PATH is set for scripts */
|
|
+ perf_set_argv_exec_path(perf_exec_path());
|
|
+
|
|
if (!suffix && argc >= 2 && strncmp(argv[1], "-", strlen("-")) != 0) {
|
|
char *record_script_path, *report_script_path;
|
|
int live_pipe[2];
|
|
diff --git a/tools/perf/scripts/perl/bin/failed-syscalls-report b/tools/perf/scripts/perl/bin/failed-syscalls-report
|
|
index e3a5e55..4028d92 100644
|
|
--- a/tools/perf/scripts/perl/bin/failed-syscalls-report
|
|
+++ b/tools/perf/scripts/perl/bin/failed-syscalls-report
|
|
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
|
|
shift
|
|
fi
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/failed-syscalls.pl $comm
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/failed-syscalls.pl $comm
|
|
diff --git a/tools/perf/scripts/perl/bin/rw-by-file-report b/tools/perf/scripts/perl/bin/rw-by-file-report
|
|
index d83070b..ba25f4d 100644
|
|
--- a/tools/perf/scripts/perl/bin/rw-by-file-report
|
|
+++ b/tools/perf/scripts/perl/bin/rw-by-file-report
|
|
@@ -7,7 +7,7 @@ if [ $# -lt 1 ] ; then
|
|
fi
|
|
comm=$1
|
|
shift
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rw-by-file.pl $comm
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-file.pl $comm
|
|
|
|
|
|
|
|
diff --git a/tools/perf/scripts/perl/bin/rw-by-pid-report b/tools/perf/scripts/perl/bin/rw-by-pid-report
|
|
index 7ef4698..641a3f5 100644
|
|
--- a/tools/perf/scripts/perl/bin/rw-by-pid-report
|
|
+++ b/tools/perf/scripts/perl/bin/rw-by-pid-report
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/bash
|
|
# description: system-wide r/w activity
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rw-by-pid.pl
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-pid.pl
|
|
|
|
|
|
|
|
diff --git a/tools/perf/scripts/perl/bin/rwtop-report b/tools/perf/scripts/perl/bin/rwtop-report
|
|
index 93e698c..4918dba 100644
|
|
--- a/tools/perf/scripts/perl/bin/rwtop-report
|
|
+++ b/tools/perf/scripts/perl/bin/rwtop-report
|
|
@@ -17,7 +17,7 @@ if [ "$n_args" -gt 0 ] ; then
|
|
interval=$1
|
|
shift
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rwtop.pl $interval
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rwtop.pl $interval
|
|
|
|
|
|
|
|
diff --git a/tools/perf/scripts/perl/bin/wakeup-latency-report b/tools/perf/scripts/perl/bin/wakeup-latency-report
|
|
index a0d898f..49052eb 100644
|
|
--- a/tools/perf/scripts/perl/bin/wakeup-latency-report
|
|
+++ b/tools/perf/scripts/perl/bin/wakeup-latency-report
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/bash
|
|
# description: system-wide min/max/avg wakeup latency
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/wakeup-latency.pl
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/wakeup-latency.pl
|
|
|
|
|
|
|
|
diff --git a/tools/perf/scripts/perl/bin/workqueue-stats-report b/tools/perf/scripts/perl/bin/workqueue-stats-report
|
|
index 3508113..df0c65f 100644
|
|
--- a/tools/perf/scripts/perl/bin/workqueue-stats-report
|
|
+++ b/tools/perf/scripts/perl/bin/workqueue-stats-report
|
|
@@ -1,6 +1,6 @@
|
|
#!/bin/bash
|
|
# description: workqueue stats (ins/exe/create/destroy)
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/workqueue-stats.pl
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/workqueue-stats.pl
|
|
|
|
|
|
|
|
diff --git a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
|
|
index 3029354..0358702 100644
|
|
--- a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
|
|
+++ b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
|
|
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
|
|
shift
|
|
fi
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/python/failed-syscalls-by-pid.py $comm
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $comm
|
|
diff --git a/tools/perf/scripts/python/bin/sched-migration-report b/tools/perf/scripts/python/bin/sched-migration-report
|
|
index 61d05f7..df1791f 100644
|
|
--- a/tools/perf/scripts/python/bin/sched-migration-report
|
|
+++ b/tools/perf/scripts/python/bin/sched-migration-report
|
|
@@ -1,3 +1,3 @@
|
|
#!/bin/bash
|
|
# description: sched migration overview
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/python/sched-migration.py
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sched-migration.py
|
|
diff --git a/tools/perf/scripts/python/bin/sctop-report b/tools/perf/scripts/python/bin/sctop-report
|
|
index b01c842..36b409c 100644
|
|
--- a/tools/perf/scripts/python/bin/sctop-report
|
|
+++ b/tools/perf/scripts/python/bin/sctop-report
|
|
@@ -21,4 +21,4 @@ elif [ "$n_args" -gt 0 ] ; then
|
|
interval=$1
|
|
shift
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/python/sctop.py $comm $interval
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sctop.py $comm $interval
|
|
diff --git a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
|
|
index 9e9d8dd..4eb88c9 100644
|
|
--- a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
|
|
+++ b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
|
|
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
|
|
shift
|
|
fi
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts-by-pid.py $comm
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm
|
|
diff --git a/tools/perf/scripts/python/bin/syscall-counts-report b/tools/perf/scripts/python/bin/syscall-counts-report
|
|
index dc076b6..cb2f9c5 100644
|
|
--- a/tools/perf/scripts/python/bin/syscall-counts-report
|
|
+++ b/tools/perf/scripts/python/bin/syscall-counts-report
|
|
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
|
|
shift
|
|
fi
|
|
fi
|
|
-perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts.py $comm
|
|
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts.py $comm
|
|
--
|
|
1.7.1
|
|
|