Skip to content

Commit

Permalink
perf script: Finish the rename from trace to script
Browse files Browse the repository at this point in the history
The scripts have calls to 'perf trace' that need to be converted to 'perf script', do it.

This problem was introduced in 133dc4c.

Reported-by: Torok Edwin <edwintorok@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Torok Edwin <edwintorok@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Dec 25, 2010
1 parent 104db7f commit 765532c
Show file tree
Hide file tree
Showing 31 changed files with 35 additions and 51 deletions.
2 changes: 1 addition & 1 deletion tools/perf/scripts/perl/Perf-Trace-Util/Context.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <tzanussi@gmail.com>
*
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Context.xs. XS interfaces for perf trace.
* Context.xs. XS interfaces for perf script.
*
* Copyright (C) 2009 Tom Zanussi <tzanussi@gmail.com>
*
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/scripts/perl/Perf-Trace-Util/README
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ 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
use Perf::Trace::Core
=head1 SEE ALSO
Perf (trace) documentation
Perf (script) documentation
=head1 AUTHOR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ sub clear_term
__END__
=head1 NAME
Perf::Trace::Util - Perl extension for perf trace
Perf::Trace::Util - Perl extension for perf script
=head1 SYNOPSIS
use Perf::Trace::Util;
=head1 SEE ALSO
Perf (trace) documentation
Perf (script) documentation
=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/perl/bin/failed-syscalls-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions tools/perf/scripts/perl/bin/rw-by-file-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions tools/perf/scripts/perl/bin/rw-by-pid-report
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions tools/perf/scripts/perl/bin/rwtop-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions tools/perf/scripts/perl/bin/wakeup-latency-report
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions tools/perf/scripts/perl/bin/workqueue-stats-report
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/perl/check-perf-trace.pl
Original file line number Diff line number Diff line change
@@ -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 <tzanussi@gmail.com>
# Licensed under the terms of the GNU GPL License version 2

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/perl/rw-by-file.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/perl/workqueue-stats.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <tzanussi@gmail.com>
#
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <fweisbec@gmail.com>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <tzanussi@gmail.com>
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/futex-contention-report
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/netdev-times-report
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/sched-migration-report
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/sctop-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/syscall-counts-by-pid-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/bin/syscall-counts-report
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/check-perf-trace.py
Original file line number Diff line number Diff line change
@@ -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 <tzanussi@gmail.com>
# Licensed under the terms of the GNU GPL License version 2
#
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/failed-syscalls-by-pid.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/sched-migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Copyright (C) 2010 Frederic Weisbecker <fweisbec@gmail.com>
#
# 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
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/sctop.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/syscall-counts-by-pid.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/scripts/python/syscall-counts.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
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

Expand Down

0 comments on commit 765532c

Please sign in to comment.