OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf/trace/scripting: rwtop script cleanup 

A couple of fixes for the rwtop script:

- printing the totals and clearing the hashes in the signal handler
  eventually leads to various random and serious problems when running
  the rwtop script continuously.  Moving the print_totals() calls to
  the event handlers solves that problem, and the event handlers are
  invoked frequently enough that it doesn't affect the timeliness of
  the output.

- Fix nuisance 'use of uninitialized value' warnings

Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Message-Id: <1273466820-9330-4-git-send-email-tzanussi@gmail.com>
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Tom Zanussi 2010-05-09 23:46:54 -05:00 committed by Arnaldo Carvalho de Melo
parent 6922c3d772
commit e88a4bfbcd
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/perf/scripts/perl/rwtop.pl
View File

@ -21,6 +21,7 @@ use Perf::Trace::Util;
my $default_interval = 3; my $default_interval = 3;
my $nlines = 20; my $nlines = 20;
my $print_thread; my $print_thread;
my $print_pending = 0;
my %reads; my %reads;
my %writes; my %writes;
@ -36,6 +37,8 @@ sub syscalls::sys_exit_read
$common_pid, $common_comm, $common_pid, $common_comm,
$nr, $ret) = @_; $nr, $ret) = @_;
print_check();
if ($ret > 0) { if ($ret > 0) {
$reads{$common_pid}{bytes_read} += $ret; $reads{$common_pid}{bytes_read} += $ret;
} else { } else {
@ -52,6 +55,8 @@ sub syscalls::sys_enter_read
$common_pid, $common_comm, $common_pid, $common_comm,
$nr, $fd, $buf, $count) = @_; $nr, $fd, $buf, $count) = @_;
print_check();
$reads{$common_pid}{bytes_requested} += $count; $reads{$common_pid}{bytes_requested} += $count;
$reads{$common_pid}{total_reads}++; $reads{$common_pid}{total_reads}++;
$reads{$common_pid}{comm} = $common_comm; $reads{$common_pid}{comm} = $common_comm;
@ -63,6 +68,8 @@ sub syscalls::sys_exit_write
$common_pid, $common_comm, $common_pid, $common_comm,
$nr, $ret) = @_; $nr, $ret) = @_;
print_check();
if ($ret <= 0) { if ($ret <= 0) {
$writes{$common_pid}{errors}{$ret}++; $writes{$common_pid}{errors}{$ret}++;
} }
@ -74,6 +81,8 @@ sub syscalls::sys_enter_write
$common_pid, $common_comm, $common_pid, $common_comm,
$nr, $fd, $buf, $count) = @_; $nr, $fd, $buf, $count) = @_;
print_check();
$writes{$common_pid}{bytes_written} += $count; $writes{$common_pid}{bytes_written} += $count;
$writes{$common_pid}{total_writes}++; $writes{$common_pid}{total_writes}++;
$writes{$common_pid}{comm} = $common_comm; $writes{$common_pid}{comm} = $common_comm;
@ -81,7 +90,7 @@ sub syscalls::sys_enter_write
sub trace_begin sub trace_begin
{ {
$SIG{ALRM} = \&print_totals; $SIG{ALRM} = \&set_print_pending;
alarm 1; alarm 1;
} }
@ -91,6 +100,20 @@ sub trace_end
print_totals(); print_totals();
} }
sub print_check()
{
if ($print_pending == 1) {
$print_pending = 0;
print_totals();
}
}
sub set_print_pending()
{
$print_pending = 1;
alarm $interval;
}
sub print_totals sub print_totals
{ {
my $count; my $count;
@ -106,12 +129,12 @@ sub print_totals
printf("%6s %-20s %10s %10s %10s\n", "------", "--------------------", printf("%6s %-20s %10s %10s %10s\n", "------", "--------------------",
"----------", "----------", "----------"); "----------", "----------", "----------");
foreach my $pid (sort {$reads{$b}{bytes_read} <=> foreach my $pid (sort { ($reads{$b}{bytes_read} || 0) <=>
$reads{$a}{bytes_read}} keys %reads) { ($reads{$a}{bytes_read} || 0) } keys %reads) {
my $comm = $reads{$pid}{comm}; my $comm = $reads{$pid}{comm} || "";
my $total_reads = $reads{$pid}{total_reads}; my $total_reads = $reads{$pid}{total_reads} || 0;
my $bytes_requested = $reads{$pid}{bytes_requested}; my $bytes_requested = $reads{$pid}{bytes_requested} || 0;
my $bytes_read = $reads{$pid}{bytes_read}; my $bytes_read = $reads{$pid}{bytes_read} || 0;
printf("%6s %-20s %10s %10s %10s\n", $pid, $comm, printf("%6s %-20s %10s %10s %10s\n", $pid, $comm,
$total_reads, $bytes_requested, $bytes_read); $total_reads, $bytes_requested, $bytes_read);
@ -130,11 +153,11 @@ sub print_totals
printf("%6s %-20s %10s %13s\n", "------", "--------------------", printf("%6s %-20s %10s %13s\n", "------", "--------------------",
"----------", "-------------"); "----------", "-------------");
foreach my $pid (sort {$writes{$b}{bytes_written} <=> foreach my $pid (sort { ($writes{$b}{bytes_written} || 0) <=>
$writes{$a}{bytes_written}} keys %writes) { ($writes{$a}{bytes_written} || 0)} keys %writes) {
my $comm = $writes{$pid}{comm}; my $comm = $writes{$pid}{comm} || "";
my $total_writes = $writes{$pid}{total_writes}; my $total_writes = $writes{$pid}{total_writes} || 0;
my $bytes_written = $writes{$pid}{bytes_written}; my $bytes_written = $writes{$pid}{bytes_written} || 0;
printf("%6s %-20s %10s %13s\n", $pid, $comm, printf("%6s %-20s %10s %13s\n", $pid, $comm,
$total_writes, $bytes_written); $total_writes, $bytes_written);
@ -146,7 +169,6 @@ sub print_totals
%reads = (); %reads = ();
%writes = (); %writes = ();
alarm $interval;
} }
my %unhandled; my %unhandled;