percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 05:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slew of changes from Daniel's review.

Browse Source
This commit is contained in:
Brian Fraser
2012-01-12 10:37:49 -03:00
parent 6d47e958c7
commit 3165b3c0f8
8 changed files with 580 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/DiskstatsGroupByAll.pm
View File

@@ -30,67 +30,50 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
use base qw( Diskstats );
sub group_by_all {
sub group_by {
my ($self, %args) = @_;
$self->clear_state();
if (!$self->interactive()) {
$self->parse_from(
filehandle => $args{filehandle},
filename => $args{filename},
data => $args{data},
sample_callback => sub {
$self->print_deltas(
map { ( $_ => $args{$_} ) }
qw( header_callback rows_callback ),
header_callback => $args{header_callback},
rows_callback => $args{rows_callback},
);
},
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
},
);
}
else {
my $orig = tell $args{filehandle};
my $orig = tell $args{filehandle} if $args{filehandle};
my $header_callback = $args{header_callback} || sub {
my ($self, @args) = @_;
$self->print_header(@args) if $self->{_print_header};
$self->{_print_header} = 0;
};
$self->parse_from(
filehandle => $args{filehandle},
filename => $args{filename},
data => $args{data},
sample_callback => sub {
$self->print_deltas(
header_callback => sub {
my $self = shift;
if ( $self->{_print_header} ) {
my $meth = $args{header_callback} || "print_header";
$self->$meth(@_);
}
$self->{_print_header} = undef;
},
rows_callback => $args{rows_callback},
header_callback => $header_callback,
rows_callback => $args{rows_callback},
);
},
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
);
if (!$self->prev_ts()) {
seek $args{filehandle}, $orig, 0;
}
return;
seek $args{filehandle}, $orig, 0 unless $self->prev_ts();
}
$self->clear_state();
return;
}
# The next methods are all overrides!
sub group_by {
my $self = shift;
$self->group_by_all(@_);
}
sub clear_state {
my $self = shift;
if (!$self->interactive()) {
$self->SUPER::clear_state(@_);
}
else {
my $orig_print_header = $self->{_print_header};
$self->SUPER::clear_state(@_);
$self->{_print_header} = $orig_print_header;
}
}
sub delta_against {
my ($self, $dev) = @_;
return $self->prev_stats_for($dev);