percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
baron@percona.com
2012-02-01 08:57:40 -05:00
parent d3e64ffc96 3de8aa530b
commit bcc514f9a9
3 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
bin/pt-diskstats
View File

@@ -2370,10 +2370,7 @@ sub print_deltas {
if ( $self->automatic_headers() if ( $self->automatic_headers()
&& !$self->isa("DiskstatsGroupByAll") ) && !$self->isa("DiskstatsGroupByAll") )
{ {
$header_method = ref($header_method) $self->force_print_header( $header, "#ts", "device" );
? $header_method
: "force_print_header";
$self->$header_method( $header, "#ts", "device" );
} }
} }
} }
@@ -2894,8 +2891,6 @@ my %actions = (
'D' => \&group_by, 'D' => \&group_by,
'S' => \&group_by, 'S' => \&group_by,
'i' => \&hide_inactive_disks, 'i' => \&hide_inactive_disks,
'd' => get_new_value_for( "refresh_interval",
"Enter a new refresh interval in seconds: " ),
'z' => get_new_value_for( "sample_time", 'z' => get_new_value_for( "sample_time",
"Enter a new interval between samples in seconds: " ), "Enter a new interval between samples in seconds: " ),
'c' => get_new_regex_for( "columns_regex", 'c' => get_new_regex_for( "columns_regex",
@@ -2970,6 +2965,7 @@ sub run_interactive {
gather_while => sub { getppid() }, gather_while => sub { getppid() },
samples_to_gather => $o->get('iterations'), samples_to_gather => $o->get('iterations'),
filename => $filename, filename => $filename,
sample_interval => $o->get('interval'),
); );
if ( $filename ) { if ( $filename ) {
unlink $filename unless $o->get('save-samples'); unlink $filename unless $o->get('save-samples');
@@ -3031,7 +3027,7 @@ sub run_interactive {
my $run = 1; my $run = 1;
MAIN_LOOP: MAIN_LOOP:
while ($run) { while ($run) {
my $refresh_interval = $o->get('refresh-interval'); my $refresh_interval = $o->get('interval');
my $time = scalar Time::HiRes::gettimeofday(); my $time = scalar Time::HiRes::gettimeofday();
my $sleep = $refresh_interval - fmod( $time, $refresh_interval ); my $sleep = $refresh_interval - fmod( $time, $refresh_interval );
@@ -3101,21 +3097,30 @@ sub read_command_timeout {
sub gather_samples { sub gather_samples {
my (%args) = @_; my (%args) = @_;
my $samples = 0; my $samples = 0;
my $fh; my $sample_interval = $args{sample_interval};
my @fhs;
if ( my $filename = $args{filename} ) { if ( my $filename = $args{filename} ) {
open $fh, ">>", $filename open my $fh, ">>", $filename
or die "Cannot open $filename for appending: $OS_ERROR"; or die "Cannot open $filename for appending: $OS_ERROR";
} push @fhs, $fh;
else {
$fh = \*STDOUT;
} }
$fh->autoflush(1); push @fhs, \*STDOUT;
for my $fh ( @fhs ) {
$fh->autoflush(1);
}
Time::HiRes::sleep( $sample_interval
- fmod( scalar(Time::HiRes::gettimeofday()),
$sample_interval));
GATHER_DATA: GATHER_DATA:
while ( $args{gather_while}->() ) { while ( $args{gather_while}->() ) {
my $sleep = 1 - fmod( scalar(Time::HiRes::gettimeofday()), 1 ); my $time_of_day = scalar(Time::HiRes::gettimeofday());
my $sleep = $sample_interval
- fmod( $time_of_day, $sample_interval );
Time::HiRes::sleep($sleep); Time::HiRes::sleep($sleep);
open my $diskstats_fh, "<", "/proc/diskstats" open my $diskstats_fh, "<", "/proc/diskstats"
@@ -3124,7 +3129,9 @@ sub gather_samples {
my @to_print = timestamp(); my @to_print = timestamp();
push @to_print, <$diskstats_fh>; push @to_print, <$diskstats_fh>;
print { $fh } @to_print; for my $fh ( @fhs ) {
print { $fh } @to_print;
}
close $diskstats_fh or die $OS_ERROR; close $diskstats_fh or die $OS_ERROR;
$samples++; $samples++;
@@ -3133,7 +3140,10 @@ sub gather_samples {
last GATHER_DATA; last GATHER_DATA;
} }
} }
close $fh or die $OS_ERROR; pop @fhs; # STDOUT
for my $fh ( @fhs ) {
close $fh or die $OS_ERROR;
}
return; return;
} }
@@ -3203,7 +3213,7 @@ sub help {
my $column_re = $args{OptionParser}->get('columns-regex'); my $column_re = $args{OptionParser}->get('columns-regex');
my $device_re = $args{OptionParser}->get('devices-regex'); my $device_re = $args{OptionParser}->get('devices-regex');
my $interval = $obj->sample_time() || '(none)'; my $interval = $obj->sample_time() || '(none)';
my $disp_int = $args{OptionParser}->get('refresh-interval'); my $disp_int = $args{OptionParser}->get('interval');
my $inact_disk = $obj->show_inactive() ? 'no' : 'yes'; my $inact_disk = $obj->show_inactive() ? 'no' : 'yes';
for my $re ( $column_re, $device_re ) { for my $re ( $column_re, $device_re ) {
@@ -3223,6 +3233,7 @@ sub help {
q) Quit the program q) Quit the program
------------------- Press any key to continue ----------------------- ------------------- Press any key to continue -----------------------
HELP HELP
pause(%args); pause(%args);
return; return;
} }
@@ -3319,9 +3330,8 @@ sub pause {
} }
sub timestamp { sub timestamp {
my ( $seconds, $microseconds ) = Time::HiRes::gettimeofday(); my ($s, $m) = Time::HiRes::gettimeofday();
return sprintf( "TS %d.%d %s\n", $seconds, return sprintf( "TS %d.%09d %s\n", $s, $m*1000, Transformers::ts( $s ) );
$microseconds*1000, Transformers::ts($seconds) );
} }
sub _d { sub _d {
@@ -3364,7 +3374,7 @@ sub main {
$o->get_opts(); $o->get_opts();
# --sample-time only applies to --group-by sample. # --sample-time only applies to --group-by sample.
if ( PTDEBUG && $o->get('group-by') !~ m/sample/i ) { if ( PTDEBUG && $o->get('group-by') !~ m/sample/i && $o->get('sample-time') ) {
_d("Possibly useless use of --sample-time without --group-by sample"); _d("Possibly useless use of --sample-time without --group-by sample");
} }
@@ -3678,11 +3688,12 @@ type: int
When in interactive mode, stop after N samples. Run forever by default. When in interactive mode, stop after N samples. Run forever by default.
=item --refresh-interval =item --interval
type: int; default: 1 type: int; default: 1
When in interactive mode, wait N seconds before printing to the screen. When in interactive mode, wait N seconds before printing to the screen.
Also, how often the tool should sample /proc/diskstats.
=item --show-inactive =item --show-inactive

5
lib/Diskstats.pm
View File

@@ -966,10 +966,7 @@ sub print_deltas {
if ( $self->automatic_headers() if ( $self->automatic_headers()
&& !$self->isa("DiskstatsGroupByAll") ) && !$self->isa("DiskstatsGroupByAll") )
{ {
$header_method = ref($header_method) $self->force_print_header( $header, "#ts", "device" );
? $header_method
: "force_print_header";
$self->$header_method( $header, "#ts", "device" );
} }
} }
} }

49
lib/DiskstatsMenu.pm
View File

@@ -46,8 +46,6 @@ my %actions = (
'D' => \&group_by, 'D' => \&group_by,
'S' => \&group_by, 'S' => \&group_by,
'i' => \&hide_inactive_disks, 'i' => \&hide_inactive_disks,
'd' => get_new_value_for( "refresh_interval",
"Enter a new refresh interval in seconds: " ),
'z' => get_new_value_for( "sample_time", 'z' => get_new_value_for( "sample_time",
"Enter a new interval between samples in seconds: " ), "Enter a new interval between samples in seconds: " ),
'c' => get_new_regex_for( "columns_regex", 'c' => get_new_regex_for( "columns_regex",
@@ -132,6 +130,7 @@ sub run_interactive {
gather_while => sub { getppid() }, gather_while => sub { getppid() },
samples_to_gather => $o->get('iterations'), samples_to_gather => $o->get('iterations'),
filename => $filename, filename => $filename,
sample_interval => $o->get('interval'),
); );
if ( $filename ) { if ( $filename ) {
unlink $filename unless $o->get('save-samples'); unlink $filename unless $o->get('save-samples');
@@ -198,7 +197,7 @@ sub run_interactive {
my $run = 1; my $run = 1;
MAIN_LOOP: MAIN_LOOP:
while ($run) { while ($run) {
my $refresh_interval = $o->get('refresh-interval'); my $refresh_interval = $o->get('interval');
my $time = scalar Time::HiRes::gettimeofday(); my $time = scalar Time::HiRes::gettimeofday();
my $sleep = $refresh_interval - fmod( $time, $refresh_interval ); my $sleep = $refresh_interval - fmod( $time, $refresh_interval );
@@ -286,21 +285,31 @@ sub read_command_timeout {
sub gather_samples { sub gather_samples {
my (%args) = @_; my (%args) = @_;
my $samples = 0; my $samples = 0;
my $fh; my $sample_interval = $args{sample_interval};
my @fhs;
if ( my $filename = $args{filename} ) { if ( my $filename = $args{filename} ) {
open $fh, ">>", $filename open my $fh, ">>", $filename
or die "Cannot open $filename for appending: $OS_ERROR"; or die "Cannot open $filename for appending: $OS_ERROR";
} push @fhs, $fh;
else {
$fh = \*STDOUT;
} }
$fh->autoflush(1); push @fhs, \*STDOUT;
for my $fh ( @fhs ) {
$fh->autoflush(1);
}
# Wait until the next tick of the clock
Time::HiRes::sleep( $sample_interval
- fmod( scalar(Time::HiRes::gettimeofday()),
$sample_interval));
GATHER_DATA: GATHER_DATA:
while ( $args{gather_while}->() ) { while ( $args{gather_while}->() ) {
my $sleep = 1 - fmod( scalar(Time::HiRes::gettimeofday()), 1 ); my $time_of_day = scalar(Time::HiRes::gettimeofday());
my $sleep = $sample_interval
- fmod( $time_of_day, $sample_interval );
Time::HiRes::sleep($sleep); Time::HiRes::sleep($sleep);
open my $diskstats_fh, "<", "/proc/diskstats" open my $diskstats_fh, "<", "/proc/diskstats"
@@ -309,9 +318,11 @@ sub gather_samples {
my @to_print = timestamp(); my @to_print = timestamp();
push @to_print, <$diskstats_fh>; push @to_print, <$diskstats_fh>;
# Lovely little method from IO::Handle: turns on autoflush, for my $fh ( @fhs ) {
# prints, and then restores the original autoflush state. # Lovely little method from IO::Handle: turns on autoflush,
print { $fh } @to_print; # prints, and then restores the original autoflush state.
print { $fh } @to_print;
}
close $diskstats_fh or die $OS_ERROR; close $diskstats_fh or die $OS_ERROR;
$samples++; $samples++;
@@ -320,7 +331,10 @@ sub gather_samples {
last GATHER_DATA; last GATHER_DATA;
} }
} }
close $fh or die $OS_ERROR; pop @fhs; # STDOUT
for my $fh ( @fhs ) {
close $fh or die $OS_ERROR;
}
return; return;
} }
@@ -396,7 +410,7 @@ sub help {
my $column_re = $args{OptionParser}->get('columns-regex'); my $column_re = $args{OptionParser}->get('columns-regex');
my $device_re = $args{OptionParser}->get('devices-regex'); my $device_re = $args{OptionParser}->get('devices-regex');
my $interval = $obj->sample_time() || '(none)'; my $interval = $obj->sample_time() || '(none)';
my $disp_int = $args{OptionParser}->get('refresh-interval'); my $disp_int = $args{OptionParser}->get('interval');
my $inact_disk = $obj->show_inactive() ? 'no' : 'yes'; my $inact_disk = $obj->show_inactive() ? 'no' : 'yes';
for my $re ( $column_re, $device_re ) { for my $re ( $column_re, $device_re ) {
@@ -520,9 +534,8 @@ sub pause {
sub timestamp { sub timestamp {
# TS timestamp.nanoseconds ISO8601-timestamp # TS timestamp.nanoseconds ISO8601-timestamp
my ( $seconds, $microseconds ) = Time::HiRes::gettimeofday(); my ($s, $m) = Time::HiRes::gettimeofday();
return sprintf( "TS %d.%d %s\n", $seconds, return sprintf( "TS %d.%09d %s\n", $s, $m*1000, Transformers::ts( $s ) );
$microseconds*1000, Transformers::ts($seconds) );
} }
sub _d { sub _d {