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

Fixed a 'Use of uninitialized value' error in Diskstats->print_deltas()

Browse Source 
It's not clear to me how this can even happen, as the variable is
package-scoped and set during compilation, but this should fix it.
This commit is contained in:
Brian Fraser
2012-02-02 11:14:20 -03:00
parent b0f7bc4fc6
commit 2f3f75965a
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-diskstats
View File

@@ -1550,8 +1550,11 @@ use List::Util qw( max first );
use ReadKeyMini qw( GetTerminalSize ); use ReadKeyMini qw( GetTerminalSize );
my (undef, $max_lines) = GetTerminalSize(); my $max_lines;
$Diskstats::printed_lines = $max_lines; BEGIN {
(undef, $max_lines) = GetTerminalSize();
$Diskstats::printed_lines = $max_lines;
}
my $diskstat_colno_for; my $diskstat_colno_for;
BEGIN { BEGIN {
@@ -2399,6 +2402,9 @@ sub print_deltas {
my @stats = $self->_calc_deltas(); my @stats = $self->_calc_deltas();
$Diskstats::printed_lines = $max_lines
unless defined $Diskstats::printed_lines;
if ( $self->{space_samples} && @stats && @stats > 1 if ( $self->{space_samples} && @stats && @stats > 1
&& !$Diskstats::last_was_header ) { && !$Diskstats::last_was_header ) {
print "\n"; print "\n";

10
lib/Diskstats.pm
View File

@@ -34,8 +34,11 @@ use List::Util qw( max first );
use ReadKeyMini qw( GetTerminalSize ); use ReadKeyMini qw( GetTerminalSize );
my (undef, $max_lines) = GetTerminalSize(); my $max_lines;
$Diskstats::printed_lines = $max_lines; BEGIN {
(undef, $max_lines) = GetTerminalSize();
$Diskstats::printed_lines = $max_lines;
}
my $diskstat_colno_for; my $diskstat_colno_for;
BEGIN { BEGIN {
@@ -975,6 +978,9 @@ sub print_deltas {
my @stats = $self->_calc_deltas(); my @stats = $self->_calc_deltas();
$Diskstats::printed_lines = $max_lines
unless defined $Diskstats::printed_lines;
if ( $self->{space_samples} && @stats && @stats > 1 if ( $self->{space_samples} && @stats && @stats > 1
&& !$Diskstats::last_was_header ) { && !$Diskstats::last_was_header ) {
# Print an empty line before the rows if we have more # Print an empty line before the rows if we have more