perf: Use $PERF_EXEC_PATH in canned report scripts
PATCH 1/2 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.
--- 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 +- tools/perf/scripts/python/bin/netdev-times-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 +- 13 files changed, 15 insertions(+), 15 deletions(-)
tools/perf/builtin-trace.c +3 -3
@@ -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 ];
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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/python/failed-syscalls-by-pid.py $comm
tools/perf/scripts/python/bin/netdev-times-report +1 -1
@@ -2,4 +2,4 @@ # description: display a process of packet and processing time # args: [tx] [rx] [dev=] [debug] -perf trace -s ~/libexec/perf-core/scripts/python/netdev-times.py $@ +perf trace -s "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $@
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 "$PERF_EXEC_PATH"/scripts/python/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 "$PERF_EXEC_PATH"/scripts/python/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 "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm
tools/perf/scripts/python/bin/syscall-counts-report +1 -1
@@ -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
Signature · 1 line
1.7.1
PATCH 2/2 perf: Fix detection of script extension
The extension starts with the last dot in the name, not the first.
--- tools/perf/builtin-trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/builtin-trace.c +1 -1
@@ -282,7 +282,7 @@ static int parse_scriptname(const struct option *opt __used, script++; }else { script = str; - ext =strchr (script,'.' ); + ext =strrchr (script,'.' );if (!ext) {fprintf (stderr,"invalid script extension" );return -1 ;
Signature · 1 line
1.7.1
[tip:perf/core] perf trace: Fix detection of script extension
Commit-ID: d1e95bb5309f98368dd4fbef6ff3a8f573b24506 Gitweb: http://git.kernel.org/tip/d1e95bb5309f98368dd4fbef6ff3a8f573b24506 Author: Ben Hutchings <[email protected]> AuthorDate: Sun, 10 Oct 2010 16:11:02 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sat, 23 Oct 2010 15:31:20 -0200
perf trace: Fix detection of script extension
The extension starts with the last dot in the name, not the first.
Cc: Ingo Molnar <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <1286723462.2955.206.camel@localhost>
--- tools/perf/builtin-trace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/builtin-trace.c +1 -1
@@ -282,7 +282,7 @@ static int parse_scriptname(const struct option *opt __used, script++; }else { script = str; - ext =strchr (script,'.' ); + ext =strrchr (script,'.' );if (!ext) {fprintf (stderr,"invalid script extension" );return -1 ;
[tip:perf/core] perf trace: Use $PERF_EXEC_PATH in canned report scripts
In reply to Ben HutchingsCommit-ID: 44e668c6faa9a6c477a32788e7e88f0754c54a4e Gitweb: http://git.kernel.org/tip/44e668c6faa9a6c477a32788e7e88f0754c54a4e Author: Ben Hutchings <[email protected]> AuthorDate: Sun, 10 Oct 2010 16:10:03 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sat, 23 Oct 2010 15:31:20 -0200
perf trace: 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.
Cc: Ingo Molnar <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <1286723403.2955.205.camel@localhost>
--- 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 +- tools/perf/scripts/python/bin/netdev-times-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 +- 13 files changed, 15 insertions(+), 15 deletions(-)
tools/perf/builtin-trace.c +3 -3
@@ -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 ];
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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/perl/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 "$PERF_EXEC_PATH"/scripts/python/failed-syscalls-by-pid.py $comm
tools/perf/scripts/python/bin/netdev-times-report +1 -1
@@ -2,4 +2,4 @@ # description: display a process of packet and processing time # args: [tx] [rx] [dev=] [debug] -perf trace -s ~/libexec/perf-core/scripts/python/netdev-times.py $@ +perf trace -s "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $@
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 "$PERF_EXEC_PATH"/scripts/python/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 "$PERF_EXEC_PATH"/scripts/python/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 "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm
tools/perf/scripts/python/bin/syscall-counts-report +1 -1
@@ -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