perf trace: get rid of the hard-coded paths in the report scripts, v3
PATCH 1/1 perf trace: get rid of the hard-coded paths in the report scripts, v3
The perf trace report shell scripts hard-code the exec path of the scripts into their command-lines, which doesn't work if perf has been installed somewhere else.
Instead, perf trace should create the paths at run-time. This patch does that and removes the hard-coded paths from all the report scripts.
v2 changes: The first version inadvertently caused scripts run from outside the perf exec path to fail e.g. 'perf trace -s test.py'. The fix is to try the script name without the exec path first, then the version using the exec path, which restores the expected behavior.
v3 changes, from Stephane Eranian: Besides the stat() to access() change, I fixed the pathname you were building, it was missing the language name. The way I solved that is by leveraging the scripting_ops->name field, but for that I had to make sure it would match the subdir name, i.e., all lower-case. I also add an error message when the script is not found, so users understand what went wrong without turning on any sort of debugging.
--- tools/perf/builtin-trace.c | 23 ++++++++++++++++++- 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 | 3 +- .../perf/util/scripting-engines/trace-event-perl.c | 2 +- .../util/scripting-engines/trace-event-python.c | 2 +- 14 files changed, 35 insertions(+), 15 deletions(-)
tools/perf/builtin-trace.c +21 -2
@@ -719,10 +719,29 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) }if (script_name) { - err = scripting_ops->start_script (script_name, argc, argv); +char script_exec_path[MAXPATHLEN ]; + +snprintf (script_exec_path,MAXPATHLEN ,"%s" , script_name); + +if (access (script_exec_path,R_OK )) { + +snprintf (script_exec_path,MAXPATHLEN ,"%s/scripts/%s/%s" , +perf_exec_path (), scripting_ops->name, script_name); + + err =access (script_exec_path,R_OK ); +if (err) { +fprintf (stderr,"script %s not found\n" , script_name); + goto out; + } + } + + err = scripting_ops->start_script (script_exec_path, + argc, argv);if (err) goto out; -pr_debug ("perf trace started with script %s\n\n" , script_name); + +pr_debug ("perf trace started with script %s\n\n" , + script_exec_path); } err =__cmd_trace (session);
tools/perf/scripts/perl/bin/failed-syscalls-report +1 -1
@@ -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 failed-syscalls.pl $comm
tools/perf/scripts/perl/bin/rw-by-file-report +1 -1
@@ -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 rw-by-file.pl $comm
tools/perf/scripts/perl/bin/rw-by-pid-report +1 -1
@@ -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 rw-by-pid.pl
tools/perf/scripts/perl/bin/rwtop-report +1 -1
@@ -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 rwtop.pl $interval
tools/perf/scripts/perl/bin/wakeup-latency-report +1 -1
@@ -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 wakeup-latency.pl
tools/perf/scripts/perl/bin/workqueue-stats-report +1 -1
@@ -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 workqueue-stats.pl
tools/perf/scripts/python/bin/failed-syscalls-by-pid-report +1 -1
@@ -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 failed-syscalls-by-pid.py $comm
tools/perf/scripts/python/bin/sched-migration-report +1 -1
@@ -1,3 +1,3 @@ #!/bin/bash # description: sched migration overview -perf trace $@ -s ~/libexec/perf-core/scripts/python/sched-migration.py +perf trace $@ -s sched-migration.py
tools/perf/scripts/python/bin/sctop-report +1 -1
@@ -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 sctop.py $comm $interval
tools/perf/scripts/python/bin/syscall-counts-by-pid-report +1 -1
@@ -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 syscall-counts-by-pid.py $comm
tools/perf/scripts/python/bin/syscall-counts-report +2 -1
@@ -1,3 +1,4 @@ + #!/bin/bash # description: system-wide syscall counts # args: [comm]
@@ -7,4 +8,4 @@ if [ $# -gt 0 ] ; then shift fi fi -perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts.py $comm +perf trace $@ -s syscall-counts.py $comm
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -557,7 +557,7 @@ static int perl_generate_script(const char *outfile) }struct scripting_ops perl_scripting_ops = { - .name ="Perl" , + .name ="perl" , .start_script = perl_start_script, .stop_script = perl_stop_script, .process_event = perl_process_event,
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -586,7 +586,7 @@ static int python_generate_script(const char *outfile) }struct scripting_ops python_scripting_ops = { - .name ="Python" , + .name ="python" , .start_script = python_start_script, .stop_script = python_stop_script, .process_event = python_process_event,
Signature · 1 line
1.6.4.GIT