mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-17 08:57:24 +00:00
Several corrections as per Daniel and Baron's feedback.
Still TODO: Attributes still have a single method that doubles as a getter and setter. The constructor for Diskstats is still weird -- A tad more stricter than it should be, if anything. ->print_rest is still rest, even though that's hardly memorable, mostly because of a lack of ideas on what to rename it. The main loop in the Menu is still a while (1). As a nice perk, it's nearly twice as fast now! It also adds a _very_ experimental --memory-for-speed argument, which turns on memoization for the current biggest bottleneck.
This commit is contained in:
@@ -30,23 +30,17 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
|
||||
|
||||
use base qw( Diskstats );
|
||||
|
||||
sub group_by {
|
||||
my $self = shift;
|
||||
$self->group_by_all(@_);
|
||||
}
|
||||
|
||||
sub group_by_all {
|
||||
my ($self, %args) = @_;
|
||||
|
||||
if ( !$args{clear_state} ) {
|
||||
$self->clear_state();
|
||||
}
|
||||
$self->clear_state();
|
||||
|
||||
if (!$self->interactive) {
|
||||
$self->parse_from(
|
||||
sample_callback => sub {
|
||||
$self->print_deltas(
|
||||
map { ( $_ => $args{$_} ) } qw( header_cb rest_cb ),
|
||||
map { ( $_ => $args{$_} ) }
|
||||
qw( header_callback rest_callback ),
|
||||
);
|
||||
},
|
||||
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
|
||||
@@ -57,20 +51,20 @@ sub group_by_all {
|
||||
$self->parse_from(
|
||||
sample_callback => sub {
|
||||
$self->print_deltas(
|
||||
header_cb => sub {
|
||||
header_callback => sub {
|
||||
my $self = shift;
|
||||
if ( $self->{_print_header} ) {
|
||||
my $meth = $args{header_cb} || "print_header";
|
||||
my $meth = $args{header_callback} || "print_header";
|
||||
$self->$meth(@_);
|
||||
}
|
||||
$self->{_print_header} = undef;
|
||||
},
|
||||
rest_cb => $args{rest_cb},
|
||||
rest_callback => $args{rest_callback},
|
||||
);
|
||||
},
|
||||
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
|
||||
);
|
||||
if (!$self->previous_ts) {
|
||||
if (!$self->prev_ts) {
|
||||
seek $args{filehandle}, $orig, 0;
|
||||
}
|
||||
return;
|
||||
@@ -78,6 +72,13 @@ sub group_by_all {
|
||||
$self->clear_state();
|
||||
}
|
||||
|
||||
# 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()) {
|
||||
@@ -92,12 +93,26 @@ sub clear_state {
|
||||
|
||||
sub delta_against {
|
||||
my ($self, $dev) = @_;
|
||||
return $self->previous_stats_for($dev);
|
||||
return $self->prev_stats_for($dev);
|
||||
}
|
||||
|
||||
sub delta_against_ts {
|
||||
my ($self) = @_;
|
||||
return $self->previous_ts();
|
||||
return $self->prev_ts();
|
||||
}
|
||||
|
||||
sub compute_line_ts {
|
||||
my ($self, %args) = @_;
|
||||
if ( $self->interactive() ) {
|
||||
# In interactive mode, we always compare against the previous sample,
|
||||
# but the default is to compare against the first.
|
||||
# This is generally a non-issue, because it can only happen
|
||||
# when there are more than two samples left to parse in the file,
|
||||
# which can only happen when someone sets a redisplay or sampling
|
||||
# interval (or both) too high.
|
||||
$args{first_ts} = $self->prev_ts();
|
||||
}
|
||||
return $self->SUPER::compute_line_ts(%args);
|
||||
}
|
||||
|
||||
1;
|
||||
|
Reference in New Issue
Block a user