perf/core fixes
Hi Ingo,
Please consider pulling from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
Regards,
- Arnaldo
Arnaldo Carvalho de Melo (3):
perf script: Finish the rename from trace to script
perf record: Fix use of sample_id_all userspace with !sample_id_all kernels perf script: Fix event ordering settings to work with older kernels
Franck Bui-Huu (1):
perf probe: Fix short file name probe location reporting
tools/perf/builtin-record.c | 24 +++++++++++++++---- tools/perf/builtin-script.c | 1 + tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 2 +- tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 4 +- tools/perf/scripts/perl/Perf-Trace-Util/README | 4 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm | 2 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm | 4 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 4 +- tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +- tools/perf/scripts/perl/bin/rw-by-file-report | 5 +--- tools/perf/scripts/perl/bin/rw-by-pid-report | 5 +--- tools/perf/scripts/perl/bin/rwtop-report | 5 +--- tools/perf/scripts/perl/bin/wakeup-latency-report | 5 +--- tools/perf/scripts/perl/bin/workqueue-stats-report | 6 +---- tools/perf/scripts/perl/check-perf-trace.pl | 2 +- tools/perf/scripts/perl/rw-by-file.pl | 2 +- tools/perf/scripts/perl/workqueue-stats.pl | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 2 +- .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 2 +- .../python/bin/failed-syscalls-by-pid-report | 2 +- .../scripts/python/bin/futex-contention-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 +- tools/perf/scripts/python/check-perf-trace.py | 2 +- .../perf/scripts/python/failed-syscalls-by-pid.py | 2 +- tools/perf/scripts/python/sched-migration.py | 2 +- tools/perf/scripts/python/sctop.py | 2 +- tools/perf/scripts/python/syscall-counts-by-pid.py | 2 +- tools/perf/scripts/python/syscall-counts.py | 2 +- tools/perf/util/probe-event.c | 14 +++++----- 34 files changed, 62 insertions(+), 63 deletions(-)
PATCH 1/4 perf script: Finish the rename from trace to script
From: Arnaldo Carvalho de Melo <[email protected]>
The scripts have calls to 'perf trace' that need to be converted to 'perf script', do it.
This problem was introduced in 133dc4c.
LKML-Reference: <new-submission>
--- tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 2 +- tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 4 ++-- tools/perf/scripts/perl/Perf-Trace-Util/README | 4 ++-- .../perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm | 2 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm | 4 ++-- .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 4 ++-- tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +- tools/perf/scripts/perl/bin/rw-by-file-report | 5 +---- tools/perf/scripts/perl/bin/rw-by-pid-report | 5 +---- tools/perf/scripts/perl/bin/rwtop-report | 5 +---- tools/perf/scripts/perl/bin/wakeup-latency-report | 5 +---- tools/perf/scripts/perl/bin/workqueue-stats-report | 6 +----- tools/perf/scripts/perl/check-perf-trace.pl | 2 +- tools/perf/scripts/perl/rw-by-file.pl | 2 +- tools/perf/scripts/perl/workqueue-stats.pl | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 2 +- .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 2 +- .../python/bin/failed-syscalls-by-pid-report | 2 +- .../scripts/python/bin/futex-contention-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 +- tools/perf/scripts/python/check-perf-trace.py | 2 +- .../perf/scripts/python/failed-syscalls-by-pid.py | 2 +- tools/perf/scripts/python/sched-migration.py | 2 +- tools/perf/scripts/python/sctop.py | 2 +- tools/perf/scripts/python/syscall-counts-by-pid.py | 2 +- tools/perf/scripts/python/syscall-counts.py | 2 +- 31 files changed, 35 insertions(+), 51 deletions(-)
tools/perf/scripts/perl/Perf-Trace-Util/Context.c +1 -1
@@ -8,7 +8,7 @@#line 1 "Context.xs"/* -* Context.xs. XS interfaces for perf trace. +* Context.xs. XS interfaces for perf script. * * Copyright (C) 2009 Tom Zanussi <[email protected]> *
tools/perf/scripts/perl/Perf-Trace-Util/Context.xs +2 -2
@@ -1,5 +1,5 @@ /* - * Context.xs. XS interfaces for perf trace. + * Context.xs. XS interfaces for perf script. * * Copyright (C) 2009 Tom Zanussi <[email protected]> *
@@ -23,7 +23,7 @@ #include "perl.h" #include "XSUB.h" #include "../../../perf.h" -#include "../../../util/trace-event.h" +#include "../../../util/script-event.h" MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context PROTOTYPES: ENABLE
tools/perf/scripts/perl/Perf-Trace-Util/README +2 -2
@@ -1,7 +1,7 @@ Perf-Trace-Util version 0.01 ============================ -This module contains utility functions for use with perf trace. +This module contains utility functions for use with perf script. Core.pm and Util.pm are pure Perl modules; Core.pm contains routines that the core perf support for Perl calls on and should always be
@@ -33,7 +33,7 @@ After you do that: INSTALLATION -Building perf with perf trace Perl scripting should install this +Building perf with perf script Perl scripting should install this module in the right place. You should make sure libperl and ExtUtils/Embed.pm are installed first
tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm +1 -1
@@ -34,7 +34,7 @@ Perf::Trace::Context - Perl extension for accessing functions in perf. =head1 SEE ALSO -Perf (trace) documentation +Perf (script) documentation =head1 AUTHOR
tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm +2 -2
@@ -163,7 +163,7 @@ sub dump_symbolic_fields __END__ =head1 NAME -Perf::Trace::Core - Perl extension for perf trace +Perf::Trace::Core - Perl extension for perf script =head1 SYNOPSIS
@@ -171,7 +171,7 @@ Perf::Trace::Core - Perl extension for perf trace =head1 SEE ALSO -Perf (trace) documentation +Perf (script) documentation =head1 AUTHOR
tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm +2 -2
@@ -65,7 +65,7 @@ sub clear_term __END__ =head1 NAME -Perf::Trace::Util - Perl extension for perf trace +Perf::Trace::Util - Perl extension for perf script =head1 SYNOPSIS
@@ -73,7 +73,7 @@ Perf::Trace::Util - Perl extension for perf trace =head1 SEE ALSO -Perf (trace) documentation +Perf (script) documentation =head1 AUTHOR
tools/perf/scripts/perl/bin/failed-syscalls-report +1 -1
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then shift fi fi -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/failed-syscalls.pl $comm +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/failed-syscalls.pl $comm
tools/perf/scripts/perl/bin/rw-by-file-report +1 -4
@@ -7,7 +7,4 @@ if [ $# -lt 1 ] ; then fi comm=$1 shift -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-file.pl $comm - - - +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-file.pl $comm
tools/perf/scripts/perl/bin/rw-by-pid-report +1 -4
@@ -1,6 +1,3 @@ #!/bin/bash # description: system-wide r/w activity -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-pid.pl - - - +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-pid.pl
tools/perf/scripts/perl/bin/rwtop-report +1 -4
@@ -17,7 +17,4 @@ if [ "$n_args" -gt 0 ] ; then interval=$1 shift fi -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rwtop.pl $interval - - - +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/rwtop.pl $interval
tools/perf/scripts/perl/bin/wakeup-latency-report +1 -4
@@ -1,6 +1,3 @@ #!/bin/bash # description: system-wide min/max/avg wakeup latency -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/wakeup-latency.pl - - - +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/wakeup-latency.pl
tools/perf/scripts/perl/bin/workqueue-stats-report +1 -5
@@ -1,7 +1,3 @@ #!/bin/bash # description: workqueue stats (ins/exe/create/destroy) -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/workqueue-stats.pl - - - - +perf script $@ -s "$PERF_EXEC_PATH"/scripts/perl/workqueue-stats.pl
tools/perf/scripts/perl/check-perf-trace.pl +1 -1
@@ -1,4 +1,4 @@ -# perf trace event handlers, generated by perf trace -g perl +# perf script event handlers, generated by perf script -g perl # (c) 2009, Tom Zanussi <[email protected]> # Licensed under the terms of the GNU GPL License version 2
tools/perf/scripts/perl/rw-by-file.pl +1 -1
@@ -18,7 +18,7 @@ use lib "./Perf-Trace-Util/lib"; use Perf::Trace::Core; use Perf::Trace::Util; -my $usage = "perf trace -s rw-by-file.pl <comm>\n"; +my $usage = "perf script -s rw-by-file.pl <comm>\n"; my $for_comm = shift or die $usage;
tools/perf/scripts/perl/workqueue-stats.pl +1 -1
@@ -10,7 +10,7 @@ # workqueue:workqueue_destruction -e workqueue:workqueue_execution # -e workqueue:workqueue_insertion # -# perf trace -p -s tools/perf/scripts/perl/workqueue-stats.pl +# perf script -p -s tools/perf/scripts/perl/workqueue-stats.pl use 5.010000; use strict;
tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py +1 -1
@@ -1,4 +1,4 @@ -# Core.py - Python extension for perf trace, core functions +# Core.py - Python extension for perf script, core functions # # Copyright (C) 2010 by Tom Zanussi <[email protected]> #
tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py +1 -1
@@ -1,4 +1,4 @@ -# SchedGui.py - Python extension for perf trace, basic GUI code for +# SchedGui.py - Python extension for perf script, basic GUI code for # traces drawing and overview. # # Copyright (C) 2010 by Frederic Weisbecker <[email protected]>
tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py +1 -1
@@ -1,4 +1,4 @@ -# Util.py - Python extension for perf trace, miscellaneous utility code +# Util.py - Python extension for perf script, miscellaneous utility code # # Copyright (C) 2010 by Tom Zanussi <[email protected]> #
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 "$PERF_EXEC_PATH"/scripts/python/failed-syscalls-by-pid.py $comm +perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/failed-syscalls-by-pid.py $comm
tools/perf/scripts/python/bin/futex-contention-report +1 -1
@@ -1,4 +1,4 @@ #!/bin/bash # description: futext contention measurement -perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/futex-contention.py +perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/futex-contention.py
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 "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $@ +perf script -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 "$PERF_EXEC_PATH"/scripts/python/sched-migration.py +perf script $@ -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 "$PERF_EXEC_PATH"/scripts/python/sctop.py $comm $interval +perf script $@ -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 "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm +perf script $@ -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 "$PERF_EXEC_PATH"/scripts/python/syscall-counts.py $comm +perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts.py $comm
tools/perf/scripts/python/check-perf-trace.py +1 -1
@@ -1,4 +1,4 @@ -# perf trace event handlers, generated by perf trace -g python +# perf script event handlers, generated by perf script -g python # (c) 2010, Tom Zanussi <[email protected]> # Licensed under the terms of the GNU GPL License version 2 #
tools/perf/scripts/python/failed-syscalls-by-pid.py +1 -1
@@ -15,7 +15,7 @@ from perf_trace_context import * from Core import * from Util import * -usage = "perf trace -s syscall-counts-by-pid.py [comm|pid]\n"; +usage = "perf script -s syscall-counts-by-pid.py [comm|pid]\n"; for_comm = None for_pid = None
tools/perf/scripts/python/sched-migration.py +1 -1
@@ -4,7 +4,7 @@ # # Copyright (C) 2010 Frederic Weisbecker <[email protected]> # -# perf trace event handlers have been generated by perf trace -g python +# perf script event handlers have been generated by perf script -g python # # This software is distributed under the terms of the GNU General # Public License ("GPL") version 2 as published by the Free Software
tools/perf/scripts/python/sctop.py +1 -1
@@ -17,7 +17,7 @@ from perf_trace_context import * from Core import * from Util import * -usage = "perf trace -s sctop.py [comm] [interval]\n"; +usage = "perf script -s sctop.py [comm] [interval]\n"; for_comm = None default_interval = 3
tools/perf/scripts/python/syscall-counts-by-pid.py +1 -1
@@ -14,7 +14,7 @@ from perf_trace_context import * from Core import * from Util import syscall_name -usage = "perf trace -s syscall-counts-by-pid.py [comm]\n"; +usage = "perf script -s syscall-counts-by-pid.py [comm]\n"; for_comm = None for_pid = None
tools/perf/scripts/python/syscall-counts.py +1 -1
@@ -15,7 +15,7 @@ from perf_trace_context import * from Core import * from Util import syscall_name -usage = "perf trace -s syscall-counts.py [comm]\n"; +usage = "perf script -s syscall-counts.py [comm]\n"; for_comm = None
Signature · 1 line
1.6.2.5
PATCH 2/4 perf record: Fix use of sample_id_all userspace with !sample_id_all kernels
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Check if parse_single_tracepoint_event has already asked for PERF_SAMPLE_TIME.
This is kludgy but short term fix for problems introduced by eac23d1c that broke 'perf script' by having different sample_types when using multiple tracepoint events when we use a perf binary that tries to use sample_id_all on an older kernel.
We need to move counter creation to perf_session, support different sample_types, etc.
Ongoing work on the perf test infrastructure needs this so that we can create counters to monitor threads generating specific events, etc.
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
Cc: Torok Edwin <[email protected]>
Cc: Ian Munsie <[email protected]>
LKML-Reference: <new-submission>
--- tools/perf/builtin-record.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-)
tools/perf/builtin-record.c +19 -5
@@ -243,6 +243,19 @@ static void create_counter(int counter, int cpu)u64 time_running;u64 id; } read_data; +/* +* Check if parse_single_tracepoint_event has already asked for +* PERF_SAMPLE_TIME. +* +* XXX this is kludgy but short term fix for problems introduced by +* eac23d1c that broke 'perf script' by having different sample_types +* when using multiple tracepoint events when we use a perf binary +* that tries to use sample_id_all on an older kernel. +* +* We need to move counter creation to perf_session, support +* different sample_types, etc. +*/ +bool time_needed = attr->sample_type &PERF_SAMPLE_TIME ; attr->read_format =PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_TOTAL_TIME_RUNNING |
@@ -285,7 +298,8 @@ static void create_counter(int counter, int cpu)if (system_wide) attr->sample_type |=PERF_SAMPLE_CPU ; -if (sample_time || system_wide || !no_inherit || cpu_list) +if (sample_id_all_avail && + (sample_time || system_wide || !no_inherit || cpu_list)) attr->sample_type |=PERF_SAMPLE_TIME ;if (raw_samples) {
@@ -294,9 +308,6 @@ static void create_counter(int counter, int cpu) attr->sample_type |=PERF_SAMPLE_CPU ; } -if (!sample_type) - sample_type = attr->sample_type; - attr->mmap = track; attr->comm = track; attr->inherit = !no_inherit;
@@ -327,7 +338,7 @@ try_again:* Old kernel, no attr->sample_id_type_all field */ sample_id_all_avail = false; -if (!sample_time && !raw_samples) +if (!sample_time && !raw_samples && !time_needed) attr->sample_type &= ~PERF_SAMPLE_TIME ; goto retry_sample_id;
@@ -428,6 +439,9 @@ try_again: } } } + +if (!sample_type) + sample_type = attr->sample_type; }static void open_counters (int cpu)
Signature · 1 line
1.6.2.5
PATCH 3/4 perf script: Fix event ordering settings to work with older kernels
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
If we don't use .ordering_requires_timestamps we'll end up trying to order events with no timestamps when running on older kernels.
Problem introduced in eac23d1c.
After the last three fixes, perf scripting is back working, tested with new perf userspace on old and new (with sample_id_all) kernels.
Cc: Frederic Weisbecker <[email protected]>
Cc: Ian Munsie <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
Cc: Torok Edwin <[email protected]>
LKML-Reference: <new-submission>
--- tools/perf/builtin-script.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
tools/perf/builtin-script.c +1 -0
@@ -117,6 +117,7 @@ static struct perf_event_ops event_ops = { .tracing_data = event__process_tracing_data, .build_id = event__process_build_id, .lost = process_lost_event, + .ordering_requires_timestamps = true, .ordered_samples = true, };
Signature · 1 line
1.6.2.5
PATCH 4/4 perf probe: Fix short file name probe location reporting
In reply to Arnaldo Carvalho de MeloFrom: Franck Bui-Huu <[email protected]>
After adding probes, perf-probe(1) reports the probes locations which include filenames for certain cases.
But for short file names (whose length < 32), perf-probe didn't display the name correctly. It actually skipped the first character.
Here's an example where 'icmp.c' was screwed:
$ perf probe -n -a "icmp.c;sk=*"
Add new events:
probe:icmp_push_reply (on @cmp.c)
probe:icmp_reply (on @cmp.c)
probe:icmp_reply_1 (on @cmp.c)
probe:icmp_send (on @cmp.c)
probe:icmp_send_1 (on @cmp.c)
probe:icmp_error (on @cmp.c)
probe:icmp_error_1 (on @cmp.c)
probe:icmp_error_2 (on @cmp.c)
probe:icmp_error_3 (on @cmp.c)This patch fixes this bug in synthesize_perf_probe_point().
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/util/probe-event.c +7 -7
@@ -1068,13 +1068,13 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp) goto error; }if (pp->file) { - len =strlen (pp->file) -31 ; -if (len <0 ) - len =0 ; - tmp =strchr (pp->file + len,'/' ); -if (!tmp) - tmp = pp->file + len; - ret =e_snprintf (file,32 ,"@%s" , tmp +1 ); + tmp = pp->file; + len =strlen (tmp); +if (len >30 ) { + tmp =strchr (pp->file + len -30 ,'/' ); + tmp = tmp ? tmp +1 : pp->file + len -30 ; + } + ret =e_snprintf (file,32 ,"@%s" , tmp);if (ret <=0 ) goto error; }
Signature · 1 line
1.6.2.5
Quoted 45 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6perf/coreRegards,
- Arnaldo
Arnaldo Carvalho de Melo (3):
perf script: Finish the rename from trace to script
perf record: Fix use ofsample_id_alluserspace with !sample_id_all kernels perf script: Fix event ordering settings to work with older kernelsFranck Bui-Huu (1):
perf probe: Fix short file name probe location reportingtools/perf/builtin-record.c | 24 +++++++++++++++---- tools/perf/builtin-script.c | 1 + tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 2 +- tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 4 +- tools/perf/scripts/perl/Perf-Trace-Util/README | 4 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm | 2 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm | 4 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 4 +- tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +- tools/perf/scripts/perl/bin/rw-by-file-report | 5 +--- tools/perf/scripts/perl/bin/rw-by-pid-report | 5 +--- tools/perf/scripts/perl/bin/rwtop-report | 5 +--- tools/perf/scripts/perl/bin/wakeup-latency-report | 5 +--- tools/perf/scripts/perl/bin/workqueue-stats-report | 6 +---- tools/perf/scripts/perl/check-perf-trace.pl | 2 +- tools/perf/scripts/perl/rw-by-file.pl | 2 +- tools/perf/scripts/perl/workqueue-stats.pl | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 2 +- .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 2 +- .../python/bin/failed-syscalls-by-pid-report | 2 +- .../scripts/python/bin/futex-contention-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 +-
Quoted 8 lines
tools/perf/scripts/python/check-perf-trace.py | 2 +- .../perf/scripts/python/failed-syscalls-by-pid.py | 2 +- tools/perf/scripts/python/sched-migration.py | 2 +- tools/perf/scripts/python/sctop.py | 2 +- tools/perf/scripts/python/syscall-counts-by-pid.py | 2 +- tools/perf/scripts/python/syscall-counts.py | 2 +- tools/perf/util/probe-event.c | 14 +++++----- 34 files changed, 62 insertions(+), 63 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo