mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-26 23:45:44 +00:00
Work in progress v2: Redesign pt-diskstats in Perl.
This commit is contained in:
761
lib/Diskstats.pm
761
lib/Diskstats.pm
@@ -19,7 +19,7 @@
|
||||
# ###########################################################################
|
||||
{
|
||||
# Package: Diskstats
|
||||
#
|
||||
#
|
||||
|
||||
package Diskstats;
|
||||
|
||||
@@ -31,47 +31,118 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
|
||||
use IO::Handle;
|
||||
use List::Util qw( max first );
|
||||
|
||||
sub new {
|
||||
my ( $class, %args ) = @_;
|
||||
|
||||
my $self = {
|
||||
filename => '/proc/diskstats',
|
||||
column_regex => qr/cnc|rt|mb|busy|prg/,
|
||||
device_regex => qr/(?=)/,
|
||||
block_size => 512,
|
||||
stats_for => {},
|
||||
out_fh => \*STDOUT,
|
||||
%args,
|
||||
_sorted_devs => [],
|
||||
_save_curr_as_prev => 1, # Internal for now
|
||||
_first => 1,
|
||||
};
|
||||
BEGIN {
|
||||
# This BEGIN block checks if we can use Storable::dclone: If we can't,
|
||||
# it clobbers this package's dclone glob (*{ __PACKAGE__ . "::dclone" })
|
||||
# with an anonymous function that provides more or less what we need.
|
||||
my $have_storable = eval { require Storable };
|
||||
|
||||
return bless $self, $class;
|
||||
if ( $have_storable ) {
|
||||
Storable->import(qw(dclone));
|
||||
}
|
||||
else {
|
||||
# An extrenely poor man's dclone.
|
||||
require Scalar::Util;
|
||||
|
||||
# Nevermind the prototype. dclone has it, so it's here only it for
|
||||
# the sake of completeness.
|
||||
*dclone = sub ($) {
|
||||
my ($ref) = @_;
|
||||
my $reftype = Scalar::Util::reftype($ref) || '';
|
||||
|
||||
if ( $reftype eq ref({}) ) {
|
||||
# Only one level of depth. Not worth making it any deeper/recursive, I think.
|
||||
return { map { $_ => {%{$ref->{$_}}} } keys %$ref };
|
||||
}
|
||||
else {
|
||||
die "This basic dclone does not support [$reftype]";
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
sub new {
|
||||
my ( $class, %args ) = @_;
|
||||
|
||||
my $self = {
|
||||
filename => '/proc/diskstats',
|
||||
column_regex => qr/cnc|rt|mb|busy|prg/,
|
||||
device_regex => qr/(?=)/,
|
||||
block_size => 512,
|
||||
out_fh => \*STDOUT,
|
||||
filter_zeroed_rows => 0,
|
||||
samples_to_gather => 0,
|
||||
interval => 0,
|
||||
interactive => 0,
|
||||
%args,
|
||||
_stats_for => {},
|
||||
_sorted_devs => [],
|
||||
_ts => {},
|
||||
_save_curr_as_prev => 1, # Internal for now
|
||||
_first => 1,
|
||||
};
|
||||
|
||||
return bless $self, $class;
|
||||
}
|
||||
|
||||
sub _ts_common {
|
||||
my ($self, $key, $val) = @_;
|
||||
if ($val) {
|
||||
$self->{_ts}->{$key} = $val;
|
||||
}
|
||||
return $self->{_ts}->{$key};
|
||||
}
|
||||
|
||||
sub current_ts {
|
||||
my ($self, $val) = @_;
|
||||
return $self->_ts_common("current", $val);
|
||||
}
|
||||
|
||||
sub previous_ts {
|
||||
my ($self, $val) = @_;
|
||||
return $self->_ts_common("previous", $val);
|
||||
}
|
||||
|
||||
sub first_ts {
|
||||
my ($self, $val) = @_;
|
||||
return $self->_ts_common("first", $val);
|
||||
}
|
||||
|
||||
sub filter_zeroed_rows {
|
||||
my ($self, $new_val) = @_;
|
||||
if ( $new_val ) {
|
||||
$self->{filter_zeroed_rows} = $new_val;
|
||||
}
|
||||
return $self->{filter_zeroed_rows};
|
||||
}
|
||||
|
||||
sub interactive {
|
||||
my ($self) = @_;
|
||||
return $self->{interactive};
|
||||
}
|
||||
|
||||
sub out_fh {
|
||||
my ($self, $new_fh) = @_;
|
||||
my ( $self, $new_fh ) = @_;
|
||||
|
||||
if ($new_fh && ref($new_fh) && $new_fh->opened) {
|
||||
if ( $new_fh && ref($new_fh) && $new_fh->opened ) {
|
||||
$self->{out_fh} = $new_fh;
|
||||
}
|
||||
if (!$self->{out_fh} || !$self->{out_fh}->opened) {
|
||||
if ( !$self->{out_fh} || !$self->{out_fh}->opened ) {
|
||||
$self->{out_fh} = \*STDOUT;
|
||||
}
|
||||
return $self->{out_fh};
|
||||
}
|
||||
|
||||
sub column_regex {
|
||||
my ($self, $new_re) = @_;
|
||||
my ( $self, $new_re ) = @_;
|
||||
if ($new_re) {
|
||||
return $self->{column_regex} = $new_re;
|
||||
}
|
||||
return $self->{device_regex};
|
||||
return $self->{column_regex};
|
||||
}
|
||||
|
||||
sub device_regex {
|
||||
my ($self, $new_re) = @_;
|
||||
my ( $self, $new_re ) = @_;
|
||||
if ($new_re) {
|
||||
return $self->{device_regex} = $new_re;
|
||||
}
|
||||
@@ -79,7 +150,7 @@ sub device_regex {
|
||||
}
|
||||
|
||||
sub filename {
|
||||
my ($self, $new_filename) = @_;
|
||||
my ( $self, $new_filename ) = @_;
|
||||
if ($new_filename) {
|
||||
return $self->{filename} = $new_filename;
|
||||
}
|
||||
@@ -92,31 +163,48 @@ sub block_size {
|
||||
}
|
||||
|
||||
sub sorted_devs {
|
||||
my ($self, $new_dev) = @_;
|
||||
if ( $new_dev && !first { $new_dev eq $_ } @{$self->{_sorted_devs}} ) {
|
||||
push @{$self->{_sorted_devs}}, $new_dev;
|
||||
my ( $self, $new_dev ) = @_;
|
||||
if ( $new_dev && ref($new_dev) eq ref( [] ) ) {
|
||||
$self->{_sorted_devs} = $new_dev;
|
||||
}
|
||||
return $self->{_sorted_devs};
|
||||
return @{ $self->{_sorted_devs} };
|
||||
}
|
||||
|
||||
sub add_sorted_devs {
|
||||
my ( $self, $new_dev ) = @_;
|
||||
if ( !$self->{_seen_devs}->{$new_dev}++ ) {
|
||||
push @{ $self->{_sorted_devs} }, $new_dev;
|
||||
}
|
||||
}
|
||||
|
||||
# clear_stuff methods. LIke the name says, they clear state stored inside
|
||||
# the object.
|
||||
|
||||
sub clear_state {
|
||||
my ($self) = @_;
|
||||
$self->{_first} = 1;
|
||||
$self->clear_current_stats();
|
||||
$self->clear_previous_stats();
|
||||
$self->clear_first_stats();
|
||||
$self->clear_ts();
|
||||
$self->clear_sorted_devs();
|
||||
}
|
||||
|
||||
sub clear_ts {
|
||||
my ($self) = @_;
|
||||
$self->{_ts} = {};
|
||||
}
|
||||
|
||||
sub clear_sorted_devs {
|
||||
my $self = shift;
|
||||
$self->{_sorted_devs} = [];
|
||||
$self->{_seen_devs} = {};
|
||||
$self->sorted_devs( [] );
|
||||
}
|
||||
|
||||
sub _clear_stats_common {
|
||||
my ($self, $key, @args) = @_;
|
||||
my ( $self, $key, @args ) = @_;
|
||||
if (@args) {
|
||||
for my $dev (@_) {
|
||||
for my $dev (@args) {
|
||||
$self->{$key}->{$dev} = {};
|
||||
}
|
||||
}
|
||||
@@ -126,103 +214,49 @@ sub _clear_stats_common {
|
||||
}
|
||||
|
||||
sub clear_current_stats {
|
||||
my ($self, @args) = @_;
|
||||
$self->_clear_stats_common("stats_for", @args);
|
||||
my ( $self, @args ) = @_;
|
||||
$self->_clear_stats_common( "_stats_for", @args );
|
||||
}
|
||||
|
||||
sub clear_previous_stats {
|
||||
my ($self, @args) = @_;
|
||||
$self->_clear_stats_common("previous_stats_for", @args);
|
||||
my ( $self, @args ) = @_;
|
||||
$self->_clear_stats_common( "_previous_stats_for", @args );
|
||||
}
|
||||
|
||||
sub clear_first_stats {
|
||||
my ($self, @args) = @_;
|
||||
$self->_clear_stats_common("first_stats_for", @args);
|
||||
my ( $self, @args ) = @_;
|
||||
$self->_clear_stats_common( "_first_stats_for", @args );
|
||||
}
|
||||
|
||||
sub _stats_for_common {
|
||||
my ($self, $dev, $key) = @_;
|
||||
my ( $self, $dev, $key ) = @_;
|
||||
$self->{$key} ||= {};
|
||||
if ($dev) {
|
||||
return $self->{$key}->{$dev};
|
||||
}
|
||||
return $self->{$key};
|
||||
return $self->{$key};
|
||||
}
|
||||
|
||||
sub stats_for {
|
||||
my ($self, $dev) = @_;
|
||||
$self->_stats_for_common($dev, 'stats_for');
|
||||
my ( $self, $dev ) = @_;
|
||||
$self->_stats_for_common( $dev, '_stats_for' );
|
||||
}
|
||||
|
||||
sub previous_stats_for {
|
||||
my ($self, $dev) = @_;
|
||||
$self->_stats_for_common($dev, 'previous_stats_for');
|
||||
my ( $self, $dev ) = @_;
|
||||
$self->_stats_for_common( $dev, '_previous_stats_for' );
|
||||
}
|
||||
|
||||
sub first_stats_for {
|
||||
my ($self, $dev) = @_;
|
||||
$self->_stats_for_common($dev, 'first_stats_for');
|
||||
my ( $self, $dev ) = @_;
|
||||
$self->_stats_for_common( $dev, '_first_stats_for' );
|
||||
}
|
||||
|
||||
sub has_stats {
|
||||
my ($self) = @_;
|
||||
# XXX TODO Greh. The stats_for hash has a bunch of stuff that shouldn't
|
||||
# be public. Implementation detail showing through, FIX.
|
||||
|
||||
return $self->stats_for
|
||||
&& scalar grep 1, @{ $self->stats_for }{ @{$self->sorted_devs} };
|
||||
}
|
||||
|
||||
my @columns_in_order = (
|
||||
# Colum # Format # Key name
|
||||
[ " rd_s" => "%7.1f", "reads_sec", ],
|
||||
[ "rd_avkb" => "%7.1f", "avg_read_sz", ],
|
||||
[ "rd_mb_s" => "%7.1f", "mbytes_read_sec", ],
|
||||
[ "rd_mrg" => "%5.0f%%", "read_merge_pct", ],
|
||||
[ "rd_cnc" => "%6.1f", "read_conc", ],
|
||||
[ " rd_rt" => "%7.1f", "read_rtime", ],
|
||||
[ " wr_s" => "%7.1f", "writes_sec", ],
|
||||
[ "wr_avkb" => "%7.1f", "avg_write_sz", ],
|
||||
[ "wr_mb_s" => "%7.1f", "mbytes_written_sec", ],
|
||||
[ "wr_mrg" => "%5.0f%%", "write_merge_pct", ],
|
||||
[ "wr_cnc" => "%6.1f", "write_conc", ],
|
||||
[ " wr_rt" => "%7.1f", "write_rtime", ],
|
||||
[ "busy" => "%3.0f%%", "busy", ],
|
||||
[ "in_prg" => "%6d", "in_progress", ],
|
||||
);
|
||||
|
||||
my %format_for = (
|
||||
map { ( $_->[0] => $_->[1] ) } @columns_in_order,
|
||||
);
|
||||
|
||||
{
|
||||
|
||||
my %column_to_key = (
|
||||
map { ( $_->[0] => $_->[2] ) } @columns_in_order,
|
||||
);
|
||||
|
||||
sub _column_to_key {
|
||||
my ($self, $col) = @_;
|
||||
return $column_to_key{$col};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub design_print_formats {
|
||||
my $self = shift;
|
||||
my ($dev_length, @columns) = @_;
|
||||
my ($header, $format);
|
||||
# For each device, print out the following: The timestamp offset and
|
||||
# device name.
|
||||
$header = $format = qq{%5s %-${dev_length}s };
|
||||
|
||||
if ( !@columns ) {
|
||||
@columns = grep { $self->col_ok($_) } map { $_->[0] } @columns_in_order;
|
||||
}
|
||||
|
||||
$header .= join " ", @columns;
|
||||
$format .= join " ", @format_for{@columns};
|
||||
|
||||
return ($header, $format, \@columns);
|
||||
&& scalar grep 1, @{ $self->stats_for }{ $self->sorted_devs };
|
||||
}
|
||||
|
||||
sub trim {
|
||||
@@ -233,27 +267,92 @@ sub trim {
|
||||
}
|
||||
|
||||
sub col_ok {
|
||||
my ($self, $column) = @_;
|
||||
my $regex = $self->column_regex;
|
||||
my ( $self, $column ) = @_;
|
||||
my $regex = $self->column_regex;
|
||||
return $column =~ $regex || trim($column) =~ $regex;
|
||||
}
|
||||
|
||||
sub dev_ok {
|
||||
my ($self, $device) = @_;
|
||||
my $regex = $self->device_regex;
|
||||
my ( $self, $device ) = @_;
|
||||
my $regex = $self->device_regex;
|
||||
return $device =~ $regex;
|
||||
}
|
||||
|
||||
sub parse_diskstats_line {
|
||||
my ($self, $line) = @_;
|
||||
my @keys = qw(
|
||||
reads reads_merged read_sectors ms_spent_reading
|
||||
writes writes_merged written_sectors ms_spent_writing
|
||||
ios_in_progress ms_spent_doing_io ms_weighted
|
||||
);
|
||||
my ($dev, %dev_stats);
|
||||
my @columns_in_order = (
|
||||
# Column # Format # Key name
|
||||
[ " rd_s" => "%7.1f", "reads_sec", ],
|
||||
[ "rd_avkb" => "%7.1f", "avg_read_sz", ],
|
||||
[ "rd_mb_s" => "%7.1f", "mbytes_read_sec", ],
|
||||
[ "rd_mrg" => "%5.0f%%", "read_merge_pct", ],
|
||||
[ "rd_cnc" => "%6.1f", "read_conc", ],
|
||||
[ " rd_rt" => "%7.1f", "read_rtime", ],
|
||||
[ " wr_s" => "%7.1f", "writes_sec", ],
|
||||
[ "wr_avkb" => "%7.1f", "avg_write_sz", ],
|
||||
[ "wr_mb_s" => "%7.1f", "mbytes_written_sec", ],
|
||||
[ "wr_mrg" => "%5.0f%%", "write_merge_pct", ],
|
||||
[ "wr_cnc" => "%6.1f", "write_conc", ],
|
||||
[ " wr_rt" => "%7.1f", "write_rtime", ],
|
||||
[ "busy" => "%3.0f%%", "busy", ],
|
||||
[ "in_prg" => "%6d", "in_progress", ],
|
||||
);
|
||||
|
||||
if ((@dev_stats{qw( major minor )}, $dev, @dev_stats{@keys}) = $line =~ /^
|
||||
{
|
||||
|
||||
my %format_for = ( map { ( $_->[0] => $_->[1] ) } @columns_in_order, );
|
||||
|
||||
sub _format_for {
|
||||
my ( $self, $col ) = @_;
|
||||
return $format_for{$col};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
my %column_to_key = ( map { ( $_->[0] => $_->[2] ) } @columns_in_order, );
|
||||
|
||||
sub _column_to_key {
|
||||
my ( $self, $col ) = @_;
|
||||
return $column_to_key{$col};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub design_print_formats {
|
||||
my ( $self, %args ) = @_;
|
||||
my ( $dev_length, $columns ) = @args{qw( max_device_length columns )};
|
||||
$dev_length ||= max 6, map length, $self->sorted_devs;
|
||||
my ( $header, $format );
|
||||
|
||||
# For each device, print out the following: The timestamp offset and
|
||||
# device name.
|
||||
$header = $format = qq{%5s %-${dev_length}s };
|
||||
|
||||
if ( !$columns ) {
|
||||
@$columns = grep { $self->col_ok($_) } map { $_->[0] } @columns_in_order;
|
||||
}
|
||||
elsif ( !ref($columns) || ref($columns) ne ref([]) ) {
|
||||
die "The columns argument to design_print_formats should be an arrayref";
|
||||
}
|
||||
|
||||
$header .= join " ", @$columns;
|
||||
$format .= join " ", map $self->_format_for($_), @$columns;
|
||||
|
||||
return ( $header, $format, $columns );
|
||||
}
|
||||
|
||||
sub parse_diskstats_line {
|
||||
my ( $self, $line, $block_size ) = @_;
|
||||
my @keys = qw(
|
||||
reads reads_merged read_sectors ms_spent_reading
|
||||
writes writes_merged written_sectors ms_spent_writing
|
||||
ios_in_progress ms_spent_doing_io ms_weighted
|
||||
);
|
||||
my ( $dev, %dev_stats );
|
||||
|
||||
if ( ( @dev_stats{qw( major minor )}, $dev, @dev_stats{@keys} ) =
|
||||
$line =~ /^
|
||||
# Disk format
|
||||
\s* (\d+) # major
|
||||
\s+ (\d+) # minor
|
||||
\s+ (.+?) # Device name
|
||||
@@ -268,284 +367,408 @@ sub parse_diskstats_line {
|
||||
\s+ (\d+) # # of IOs currently in progress
|
||||
\s+ (\d+) # # of milliseconds spent doing IOs
|
||||
\s+ (\d+) # weighted # of milliseconds spent doing IOs
|
||||
\s*$/x)
|
||||
{
|
||||
$dev_stats{read_bytes} = $dev_stats{read_sectors} * $self->block_size;
|
||||
$dev_stats{written_bytes} = $dev_stats{written_sectors} * $self->block_size;
|
||||
$dev_stats{read_kbs} = $dev_stats{read_bytes} / 1024;
|
||||
$dev_stats{written_kbs} = $dev_stats{written_bytes} / 1024;
|
||||
$dev_stats{ttreq} += $dev_stats{reads} + $dev_stats{writes};
|
||||
$dev_stats{ttbyt} += $dev_stats{read_bytes} + $dev_stats{written_bytes};
|
||||
\s*$/x
|
||||
)
|
||||
{
|
||||
$dev_stats{read_bytes} = $dev_stats{read_sectors} * $block_size;
|
||||
$dev_stats{written_bytes} =
|
||||
$dev_stats{written_sectors} * $block_size;
|
||||
$dev_stats{read_kbs} = $dev_stats{read_bytes} / 1024;
|
||||
$dev_stats{written_kbs} = $dev_stats{written_bytes} / 1024;
|
||||
$dev_stats{ttreq} += $dev_stats{reads} + $dev_stats{writes};
|
||||
$dev_stats{ttbyt} += $dev_stats{read_bytes} + $dev_stats{written_bytes};
|
||||
|
||||
return ($dev, \%dev_stats);
|
||||
}
|
||||
else {
|
||||
return;
|
||||
}
|
||||
return ( $dev, \%dev_stats );
|
||||
}
|
||||
elsif ((@dev_stats{qw( major minor )}, $dev, @dev_stats{ qw( reads read_sectors writes written_sectors ) }) = $line =~ /^
|
||||
# Partition format
|
||||
\s* (\d+) # major
|
||||
\s+ (\d+) # minor
|
||||
\s+ (.+?) # Device name
|
||||
\s+ (\d+) # # of reads issued
|
||||
\s+ (\d+) # # of sectors read
|
||||
\s+ (\d+) # # of writes issued
|
||||
\s+ (\d+) # # of sectors written
|
||||
\s*$/x) {
|
||||
for my $key ( @keys ) {
|
||||
$dev_stats{$key} ||= 0;
|
||||
}
|
||||
# Copypaste from above, abstract?
|
||||
$dev_stats{read_bytes} = $dev_stats{read_sectors} * $block_size;
|
||||
$dev_stats{written_bytes} =
|
||||
$dev_stats{written_sectors} * $block_size;
|
||||
$dev_stats{read_kbs} = $dev_stats{read_bytes} / 1024;
|
||||
$dev_stats{written_kbs} = $dev_stats{written_bytes} / 1024;
|
||||
$dev_stats{ttreq} += $dev_stats{reads} + $dev_stats{writes};
|
||||
$dev_stats{ttbyt} += $dev_stats{read_bytes} + $dev_stats{written_bytes};
|
||||
|
||||
return ( $dev, \%dev_stats );
|
||||
}
|
||||
else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
sub _save_current_as_previous {
|
||||
my ($self, $dev) = @_;
|
||||
my ( $self, $curr_hashref ) = @_;
|
||||
|
||||
if ( $self->{_save_curr_as_prev} ) {
|
||||
if ( $dev ) {
|
||||
my $curr = $self->stats_for($dev);
|
||||
return unless $curr;
|
||||
while ( my ($k, $v) = each %$curr ) {
|
||||
$self->{previous_stats_for}->{$dev}{$k} = $v;
|
||||
}
|
||||
$self->previous_stats_for($dev)->{sum_ios_in_progress} += $curr->{ios_in_progress};
|
||||
$self->previous_stats_for->{_ts} = $self->stats_for->{_ts};
|
||||
$self->{_previous_stats_for} = $curr_hashref;
|
||||
for my $dev (keys %$curr_hashref) {
|
||||
$self->{_previous_stats_for}->{$dev}->{sum_ios_in_progress} +=
|
||||
$curr_hashref->{$dev}->{ios_in_progress};
|
||||
}
|
||||
else {
|
||||
for my $dev ( grep { $_ ne '_ts' } keys %{$self->stats_for} ) {
|
||||
$self->previous_stats_for->{$dev} = \%{$self->stats_for->{$dev}};
|
||||
}
|
||||
$self->previous_stats_for->{_ts} = $self->stats_for->{_ts};
|
||||
}
|
||||
}
|
||||
$self->previous_ts($self->current_ts());
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
sub _save_current_as_first {
|
||||
my ($self) = @_;
|
||||
my ($self, $curr_hashref) = @_;
|
||||
|
||||
if ( $self->{_first} ) {
|
||||
for my $dev ( grep { $_ ne '_ts' } keys %{$self->stats_for} ) {
|
||||
$self->first_stats_for->{$dev} = \%{$self->stats_for->{$dev}};
|
||||
}
|
||||
$self->first_stats_for->{_ts} = $self->stats_for->{_ts};
|
||||
$self->{_first_stats_for} = $curr_hashref;
|
||||
$self->first_ts($self->current_ts());
|
||||
$self->{_first} = undef;
|
||||
}
|
||||
}
|
||||
|
||||
sub parse_from {
|
||||
my ($self, %args) = @_;
|
||||
sub _save_stats {
|
||||
my ( $self, $hashref ) = @_;
|
||||
$self->{_stats_for} = $hashref;
|
||||
}
|
||||
|
||||
if ($args{filehandle}) {
|
||||
$self->parse_from_filehandle(@args{ qw( filehandle ts_callback ) });
|
||||
}
|
||||
elsif ($args{data}) {
|
||||
open my $fh, "<", \$args{data}
|
||||
or die "Couldn't open scalar as filehandle: $OS_ERROR";
|
||||
$self->parse_from_filehandle($fh, $args{ts_callback});
|
||||
close($fh);
|
||||
}
|
||||
else {
|
||||
$self->parse_from_filename(@args{ qw( filename ts_callback ) });
|
||||
}
|
||||
return;
|
||||
# Method: parse_from()
|
||||
# Parses data from one of the sources.
|
||||
#
|
||||
# Parameters:
|
||||
# %args - Arguments
|
||||
#
|
||||
# Optional Arguments:
|
||||
# filehandle - Reads data from a filehandle by calling readline() on it.
|
||||
# data - Reads data one line at a time.
|
||||
# filename - Opens a filehandle to the file and reads it one line at a time.
|
||||
# sample_callback - Called each time a sample is processed, passed the latest timestamp.
|
||||
#
|
||||
|
||||
sub parse_from {
|
||||
my ( $self, %args ) = @_;
|
||||
|
||||
my $lines_read = $args{filehandle}
|
||||
? $self->parse_from_filehandle( @args{qw( filehandle sample_callback )} ) :
|
||||
$args{data}
|
||||
? $self->parse_from_data( @args{qw( data sample_callback )} ) :
|
||||
$self->parse_from_filename( @args{qw( filename sample_callback )} );
|
||||
return $lines_read;
|
||||
}
|
||||
|
||||
sub parse_from_filename {
|
||||
my ($self, $filename, $ts_callback) = @_;
|
||||
my ( $self, $filename, $sample_callback ) = @_;
|
||||
|
||||
$filename ||= $self->filename;
|
||||
|
||||
open my $fh, "<", $filename
|
||||
or die "Couldn't open ", $filename, ": $OS_ERROR";
|
||||
|
||||
$self->parse_from_filehandle($fh, $ts_callback);
|
||||
|
||||
or die "Couldn't open ", $filename, ": $OS_ERROR";
|
||||
my $lines_read = $self->parse_from_filehandle( $fh, $sample_callback );
|
||||
close($fh) or die "Couldn't close: $OS_ERROR";
|
||||
return;
|
||||
|
||||
return $lines_read;
|
||||
}
|
||||
# Method: parse_from_filehandle()
|
||||
# Parses data received from using readline() on the filehandle. This is
|
||||
# particularly useful, as you could pass in a filehandle to a pipe, or
|
||||
# a tied filehandle, or a PerlIO::Scalar handle. Or your normal
|
||||
# run of the mill filehandle.
|
||||
#
|
||||
# Parameters:
|
||||
# $filehandle -
|
||||
# sample_callback - Called each time a sample is processed, passed the latest timestamp.
|
||||
#
|
||||
|
||||
sub parse_from_filehandle {
|
||||
my ($self, $filehandle, $ts_callback) = @_;
|
||||
$self->_load($filehandle, $ts_callback);
|
||||
return;
|
||||
my ( $self, $filehandle, $sample_callback ) = @_;
|
||||
return $self->_load( $filehandle, $sample_callback );;
|
||||
}
|
||||
|
||||
# Reads from the filehandle, either saving the data as needed if dealing
|
||||
# with a diskstats-formatted line, or if it finds a TS line and has a
|
||||
# callback, defering to that.
|
||||
sub parse_from_data {
|
||||
my ( $self, $data, $sample_callback ) = @_;
|
||||
|
||||
open my $fh, "<", \$data
|
||||
or die "Couldn't open scalar as filehandle: $OS_ERROR";
|
||||
my $lines_read = $self->parse_from_filehandle( $fh, $sample_callback );
|
||||
close($fh);
|
||||
|
||||
return $lines_read;
|
||||
}
|
||||
|
||||
# Method: parse_from()
|
||||
# Reads from the filehandle, either saving the data as needed if dealing
|
||||
# with a diskstats-formatted line, or if it finds a TS line and has a
|
||||
# callback, defering to that.
|
||||
|
||||
sub _load {
|
||||
my ($self, $fh, $ts_callback) = @_;
|
||||
my ( $self, $fh, $sample_callback ) = @_;
|
||||
my $lines_read = 0;
|
||||
my $block_size = $self->block_size;
|
||||
|
||||
while (my $line = <$fh>) {
|
||||
if ( my ($dev, $dev_stats) = $self->parse_diskstats_line($line) ) {
|
||||
$self->_save_current_as_previous($dev);
|
||||
$self->clear_current_stats($dev);
|
||||
my $new_cur = {};
|
||||
|
||||
@{$self->stats_for($dev)}{ keys %$dev_stats } = values %$dev_stats;
|
||||
$self->sorted_devs($dev);
|
||||
while ( my $line = <$fh> ) {
|
||||
if ( my ( $dev, $dev_stats ) = $self->parse_diskstats_line($line, $block_size) ) {
|
||||
$new_cur->{$dev} = $dev_stats;
|
||||
$self->add_sorted_devs($dev);
|
||||
}
|
||||
elsif ( my ($ts) = $line =~ /TS\s+([0-9]+(?:\.[0-9]+)?)/ ) {
|
||||
if ( $self->has_stats() ) {
|
||||
$self->stats_for->{_ts} = $ts;
|
||||
$self->_save_current_as_first;
|
||||
if ( %{$new_cur} ) {
|
||||
$self->_save_current_as_previous( $self->stats_for() );
|
||||
$self->_save_stats($new_cur);
|
||||
$self->current_ts($ts);
|
||||
$self->_save_current_as_first( dclone($self->stats_for) );
|
||||
$new_cur = {};
|
||||
}
|
||||
if ( $ts_callback ) {
|
||||
$self->$ts_callback($ts);
|
||||
# XXX TODO Ugly hack for interactive mode
|
||||
my $ret = 0;
|
||||
if ($sample_callback) {
|
||||
$ret = $self->$sample_callback($ts);
|
||||
}
|
||||
$lines_read = $NR;
|
||||
last if $ret;
|
||||
}
|
||||
else {
|
||||
chomp($line);
|
||||
die "Line [$line] isn't in the diskstats format";
|
||||
}
|
||||
}
|
||||
$self->_save_current_as_first;
|
||||
return;
|
||||
|
||||
if ( %{$new_cur} ) {
|
||||
#$self->_save_stats($new_cur);
|
||||
$self->_save_current_as_first( dclone($self->stats_for) );
|
||||
}
|
||||
return $lines_read;
|
||||
}
|
||||
|
||||
sub _calc_read_stats {
|
||||
my $self = shift;
|
||||
my ($delta_for, $elapsed, $devs_in_group) = @_;
|
||||
my ( $self, $delta_for, $elapsed, $devs_in_group ) = @_;
|
||||
|
||||
my %read_stats = (
|
||||
reads_sec => $delta_for->{reads} / $elapsed,
|
||||
read_requests => $delta_for->{reads_merged} + $delta_for->{reads},
|
||||
# mbytes_read_sec => $delta_for->{read_kbs} / $elapsed / 2048,
|
||||
mbytes_read_sec => $delta_for->{read_sectors} / $elapsed / 2048,
|
||||
read_conc => $delta_for->{ms_spent_reading} / $elapsed / 1000 / $devs_in_group,
|
||||
mbytes_read_sec => $delta_for->{read_kbs} / $elapsed / 1024,
|
||||
read_conc => $delta_for->{ms_spent_reading} /
|
||||
$elapsed / 1000 / $devs_in_group,
|
||||
);
|
||||
|
||||
if ( $delta_for->{reads} > 0 ) {
|
||||
$read_stats{read_rtime} = $delta_for->{ms_spent_reading} / $delta_for->{reads};
|
||||
$read_stats{avg_read_sz} = $delta_for->{read_sectors} / $delta_for->{reads};
|
||||
$read_stats{read_rtime} =
|
||||
$delta_for->{ms_spent_reading} / $delta_for->{reads};
|
||||
$read_stats{avg_read_sz} =
|
||||
$delta_for->{read_kbs} / $delta_for->{reads};
|
||||
}
|
||||
else {
|
||||
$read_stats{read_rtime} = 0;
|
||||
$read_stats{avg_read_sz} = 0;
|
||||
$read_stats{read_rtime} = 0;
|
||||
$read_stats{avg_read_sz} = 0;
|
||||
}
|
||||
|
||||
$read_stats{read_merge_pct} = $read_stats{read_requests} > 0
|
||||
? 100 * $delta_for->{reads_merged} / $read_stats{read_requests}
|
||||
: 0;
|
||||
$read_stats{read_merge_pct} =
|
||||
$read_stats{read_requests} > 0
|
||||
? 100 * $delta_for->{reads_merged} / $read_stats{read_requests}
|
||||
: 0;
|
||||
|
||||
return %read_stats;
|
||||
}
|
||||
|
||||
sub _calc_write_stats {
|
||||
my $self = shift;
|
||||
my ($delta_for, $elapsed, $devs_in_group) = @_;
|
||||
my ( $self, $delta_for, $elapsed, $devs_in_group ) = @_;
|
||||
|
||||
my %write_stats = (
|
||||
writes_sec => $delta_for->{writes} / $elapsed,
|
||||
write_requests => $delta_for->{writes_merged} + $delta_for->{writes},
|
||||
# mbytes_written_sec => $delta_for->{written_kbs} / $elapsed / 2048,
|
||||
mbytes_written_sec => $delta_for->{written_sectors} / $elapsed / 2048,
|
||||
write_conc => $delta_for->{ms_spent_writing} / $elapsed / 1000 / $devs_in_group,
|
||||
writes_sec => $delta_for->{writes} / $elapsed,
|
||||
write_requests => $delta_for->{writes_merged} + $delta_for->{writes},
|
||||
|
||||
mbytes_written_sec => $delta_for->{written_kbs} / $elapsed / 1024,
|
||||
write_conc => $delta_for->{ms_spent_writing} /
|
||||
$elapsed / 1000 /
|
||||
$devs_in_group,
|
||||
);
|
||||
|
||||
if ( $delta_for->{writes} > 0 ) {
|
||||
$write_stats{write_rtime} = $delta_for->{ms_spent_writing} / $delta_for->{writes};
|
||||
$write_stats{avg_write_sz} = $delta_for->{written_sectors} / $delta_for->{writes};
|
||||
$write_stats{write_rtime} =
|
||||
$delta_for->{ms_spent_writing} / $delta_for->{writes};
|
||||
$write_stats{avg_write_sz} =
|
||||
$delta_for->{written_kbs} / $delta_for->{writes};
|
||||
}
|
||||
else {
|
||||
$write_stats{write_rtime} = 0;
|
||||
$write_stats{avg_write_sz} = 0;
|
||||
}
|
||||
|
||||
$write_stats{write_merge_pct} = $write_stats{write_requests} > 0 ? 100 * $delta_for->{writes_merged} / $write_stats{write_requests} : 0;
|
||||
$write_stats{write_merge_pct} =
|
||||
$write_stats{write_requests} > 0
|
||||
? 100 * $delta_for->{writes_merged} / $write_stats{write_requests}
|
||||
: 0;
|
||||
|
||||
return %write_stats;
|
||||
}
|
||||
|
||||
sub _calc_delta_for {
|
||||
my ($self, $current, $against) = @_;
|
||||
return {
|
||||
map { ($_ => $current->{$_} - $against->{$_}) }
|
||||
qw(
|
||||
reads reads_merged read_sectors ms_spent_reading
|
||||
writes writes_merged written_sectors ms_spent_writing
|
||||
read_kbs written_kbs
|
||||
ms_spent_doing_io ms_weighted
|
||||
)
|
||||
};
|
||||
|
||||
# Compute the numbers for reads and writes together, the things for
|
||||
# which we do not have separate statistics.
|
||||
# Busy is what iostat calls %util. This is the percent of
|
||||
# wall-clock time during which the device has I/O happening.
|
||||
|
||||
sub _calc_misc_stats {
|
||||
my ( $self, $delta_for, $elapsed, $devs_in_group, $stats ) = @_;
|
||||
my %extra_stats;
|
||||
|
||||
$extra_stats{busy} =
|
||||
100 *
|
||||
$delta_for->{ms_spent_doing_io} /
|
||||
( 1000 * $elapsed * $devs_in_group );
|
||||
|
||||
my $number_of_ios = $stats->{write_requests} + $stats->{read_requests};
|
||||
my $total_ms_spent_on_io = $delta_for->{ms_spent_reading} + $delta_for->{ms_spent_writing};
|
||||
|
||||
$extra_stats{qtime} = $number_of_ios ? $total_ms_spent_on_io / $number_of_ios : 0;
|
||||
$extra_stats{stime} = $number_of_ios ? $delta_for->{ms_spent_doing_io} / $number_of_ios : 0;
|
||||
|
||||
$extra_stats{line_ts} = $self->compute_line_ts(
|
||||
first_ts => $self->first_ts(),
|
||||
current_ts => $self->current_ts(),
|
||||
);
|
||||
|
||||
return %extra_stats;
|
||||
}
|
||||
|
||||
sub _calc_deltas {
|
||||
my $self = shift;
|
||||
my ($callback) = @_;
|
||||
sub _calc_delta_for {
|
||||
my ( $self, $current, $against ) = @_;
|
||||
return {
|
||||
map { ( $_ => $current->{$_} - $against->{$_} ) }
|
||||
qw(
|
||||
reads reads_merged read_sectors ms_spent_reading
|
||||
writes writes_merged written_sectors ms_spent_writing
|
||||
read_kbs written_kbs
|
||||
ms_spent_doing_io ms_weighted
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
my $elapsed = $self->stats_for->{_ts} - $self->delta_against->{_ts};
|
||||
die "Time elapsed is 0" unless $elapsed;
|
||||
sub _calc_stats_for_deltas {
|
||||
my ( $self, $elapsed ) = @_;
|
||||
my @end_stats;
|
||||
|
||||
for my $dev ( grep { $self->dev_ok($_) } @{$self->sorted_devs} ) {
|
||||
for my $dev ( grep { $self->dev_ok($_) && $self->stats_for($_) } $self->sorted_devs ) {
|
||||
my $curr = $self->stats_for($dev);
|
||||
my $against = $self->delta_against($dev);
|
||||
|
||||
my $delta_for = $self->_calc_delta_for($curr, $against);
|
||||
my $delta_for = $self->_calc_delta_for( $curr, $against );
|
||||
|
||||
my $in_progress = $curr->{"ios_in_progress"};
|
||||
my $tot_in_progress = $against->{"sum_ios_in_progress"} || 0;
|
||||
my $in_progress = $curr->{"ios_in_progress"};
|
||||
my $tot_in_progress = $against->{"sum_ios_in_progress"} || 0;
|
||||
|
||||
my $devs_in_group = $self->compute_devs_in_group;
|
||||
my $devs_in_group = $self->compute_devs_in_group;
|
||||
|
||||
# Compute the per-second stats for reads, writes, and overall.
|
||||
my %stats = (
|
||||
$self->_calc_read_stats($delta_for, $elapsed, $devs_in_group),
|
||||
$self->_calc_write_stats($delta_for, $elapsed, $devs_in_group),
|
||||
in_progress => $self->compute_in_progress($in_progress, $tot_in_progress),
|
||||
$self->_calc_read_stats( $delta_for, $elapsed, $devs_in_group ),
|
||||
$self->_calc_write_stats( $delta_for, $elapsed, $devs_in_group ),
|
||||
in_progress =>
|
||||
$self->compute_in_progress( $in_progress, $tot_in_progress ),
|
||||
);
|
||||
|
||||
# Compute the numbers for reads and writes together, the things for
|
||||
# which we do not have separate statistics.
|
||||
# Busy is what iostat calls %util. This is the percent of
|
||||
# wall-clock time during which the device has I/O happening.
|
||||
$stats{busy} = 100 * $delta_for->{ms_spent_doing_io} / (1000 * $elapsed * $devs_in_group);
|
||||
$stats{line_ts} = $self->compute_line_ts(
|
||||
first_ts => $self->first_stats_for->{_ts},
|
||||
current_ts => $self->stats_for->{_ts},
|
||||
);
|
||||
|
||||
my %extras = $self->_calc_misc_stats( $delta_for, $elapsed, $devs_in_group, \%stats );
|
||||
while ( my ($k, $v) = each %extras ) {
|
||||
$stats{$k} = $v;
|
||||
}
|
||||
|
||||
$stats{dev} = $dev;
|
||||
|
||||
if ($callback) {
|
||||
$self->$callback( \%stats );
|
||||
}
|
||||
push @end_stats, \%stats;
|
||||
}
|
||||
return @end_stats;
|
||||
}
|
||||
|
||||
sub _calc_deltas {
|
||||
my ( $self, $callback ) = @_;
|
||||
|
||||
my $elapsed = $self->current_ts() - $self->delta_against_ts();
|
||||
die "Time elapsed is [$elapsed]" unless $elapsed;
|
||||
|
||||
return $self->_calc_stats_for_deltas($elapsed);
|
||||
}
|
||||
|
||||
sub print_header {
|
||||
my ($self, $header, @args) = @_;
|
||||
printf { $self->out_fh } $header . "\n", @args;
|
||||
}
|
||||
|
||||
sub print_rest {
|
||||
my ($self, $format, $cols, $stat) = @_;
|
||||
if ( $self->filter_zeroed_rows ) {
|
||||
return unless grep $_, @{$stat}{ @$cols };
|
||||
}
|
||||
printf { $self->out_fh } $format . "\n",
|
||||
@{$stat}{ qw( line_ts dev ), @$cols };
|
||||
}
|
||||
|
||||
sub print_deltas {
|
||||
my ($self, %args) = @_;
|
||||
my $longest_dev = $args{dev_length} || max 6, map length, @{$self->sorted_devs};
|
||||
my ($header, $format, $cols) = $self->design_print_formats($longest_dev);
|
||||
my ( $self, %args ) = @_;
|
||||
my ( $header, $format, $cols ) = $self->design_print_formats(
|
||||
max_device_length => $args{max_device_length},
|
||||
columns => $args{columns},
|
||||
);
|
||||
|
||||
return unless $self->delta_against_ts();
|
||||
|
||||
@$cols = map { $self->_column_to_key($_) } @$cols;
|
||||
my ( $header_cb, $rest_cb ) = @args{qw( header_cb rest_cb )};
|
||||
|
||||
my ($header_cb, $rest_cb) = @args{ qw( header_cb rest_cb ) };
|
||||
|
||||
return unless $self->delta_against->{_ts};
|
||||
|
||||
if ($header_cb) {
|
||||
$self->$header_cb($header, "#ts", "device");
|
||||
if ( $header_cb ) {
|
||||
$self->$header_cb( $header, "#ts", "device" );
|
||||
}
|
||||
else {
|
||||
printf { $self->out_fh } $header."\n", "#ts", "device";
|
||||
$self->print_header( $header, "#ts", "device" );
|
||||
}
|
||||
|
||||
if ($rest_cb) {
|
||||
$self->_calc_deltas( sub { shift->$rest_cb($format, $cols, shift) } );
|
||||
}
|
||||
else {
|
||||
for my $stat ( $self->_calc_deltas() ) {
|
||||
printf { $self->out_fh } $format."\n", @{$stat}{ qw( line_ts dev ), @$cols };
|
||||
for my $stat ( $self->_calc_deltas() ) {
|
||||
if ($rest_cb) {
|
||||
$self->$rest_cb( $format, $cols, $stat );
|
||||
}
|
||||
else {
|
||||
$self->print_rest( $format, $cols, $stat );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub compute_line_ts {
|
||||
... # $self->first_stats_for->{"ts"} > 0 ? sprintf("%5.1f", $curr->{ts} - $self->first_stats_for->{ts}) : sprintf("%5.1f", 0);
|
||||
my ( $self, %args ) = @_;
|
||||
return $args{first_ts} > 0
|
||||
? sprintf( "%5.1f", $args{current_ts} - $args{first_ts} )
|
||||
: sprintf( "%5.1f", 0 );
|
||||
}
|
||||
|
||||
sub compute_in_progress {
|
||||
...
|
||||
my ( $self, $in_progress, $tot_in_progress ) = @_;
|
||||
return $in_progress;
|
||||
}
|
||||
|
||||
sub compute_devs_in_group {
|
||||
1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
sub delta_against {
|
||||
... # previous_stats_for or first_stats_for
|
||||
die 'You must override delta_against() in a subclass';
|
||||
}
|
||||
|
||||
sub delta_against_ts {
|
||||
die 'You must override delta_against_ts() in a subclass';
|
||||
}
|
||||
|
||||
sub group_by {
|
||||
die 'You must override group_by() in a subclass';
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
}
|
||||
# ###########################################################################
|
||||
# End Diskstats package
|
||||
|
@@ -30,25 +30,44 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
|
||||
|
||||
use base qw( Diskstats );
|
||||
|
||||
sub group_by_all {
|
||||
my ($self, %args) = @_;
|
||||
$self->clear_state();
|
||||
$self->parse_from(
|
||||
ts_callback => sub {
|
||||
$self->print_deltas(
|
||||
map { ( $_ => $args{$_} ) } qw( header_cb rest_cb ),
|
||||
);
|
||||
},
|
||||
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
|
||||
);
|
||||
$self->clear_state();
|
||||
sub group_by {
|
||||
my $self = shift;
|
||||
$self->group_by_all(@_);
|
||||
}
|
||||
|
||||
sub compute_line_ts {
|
||||
sub group_by_all {
|
||||
my ($self, %args) = @_;
|
||||
return $args{first_ts} > 0
|
||||
? sprintf("%5.1f", $args{current_ts} - $args{first_ts})
|
||||
: sprintf("%5.1f", 0);
|
||||
|
||||
$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(filehandle filename data) ),
|
||||
);
|
||||
|
||||
$self->clear_state();
|
||||
}
|
||||
else {
|
||||
my $orig = tell $args{filehandle};
|
||||
$self->parse_from(
|
||||
sample_callback => sub {
|
||||
$self->print_deltas(
|
||||
header_cb => sub { CORE::state $x = 0; my $self = shift; $self->print_header(@_) unless $x++; },
|
||||
);
|
||||
#map { ( $_ => $args{$_} ) } qw( header_cb rest_cb ),
|
||||
},
|
||||
map( { ($_ => $args{$_}) } qw(filehandle filename data) ),
|
||||
);
|
||||
if (!$self->previous_ts) {
|
||||
seek $args{filehandle}, $orig, 0;
|
||||
}
|
||||
$self->clear_state();
|
||||
}
|
||||
}
|
||||
|
||||
sub delta_against {
|
||||
@@ -56,9 +75,9 @@ sub delta_against {
|
||||
return $self->previous_stats_for($dev);
|
||||
}
|
||||
|
||||
sub compute_in_progress {
|
||||
my ($self, $in_progress, $tot_in_progress) = @_;
|
||||
return $in_progress;
|
||||
sub delta_against_ts {
|
||||
my ($self) = @_;
|
||||
return $self->previous_ts();
|
||||
}
|
||||
|
||||
1;
|
||||
|
@@ -33,44 +33,89 @@ use base qw( Diskstats );
|
||||
sub new {
|
||||
my ($class, %args) = @_;
|
||||
my $self = $class->SUPER::new(%args);
|
||||
$self->{iterations} = 0;
|
||||
$self->{_iterations} = 0;
|
||||
$self->{_print_header} = 1;
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub group_by {
|
||||
my $self = shift;
|
||||
$self->group_by_disk(@_);
|
||||
}
|
||||
|
||||
# Prints out one line for each disk, summing over the interval from first to
|
||||
# last sample.
|
||||
sub group_by_disk {
|
||||
my ($self, %args) = @_;
|
||||
my ($header_cb, $rest_cb) = $args{ qw( header_cb rest_cb ) };
|
||||
|
||||
$self->clear_state;
|
||||
if (!$self->interactive()) {
|
||||
$self->clear_state();
|
||||
}
|
||||
|
||||
my $original_offset = $args{filehandle} ? tell($args{filehandle}) : undef;
|
||||
|
||||
my $lines_read = $self->parse_from(
|
||||
sample_callback => sub {
|
||||
my ($self, $ts) = @_;
|
||||
|
||||
$self->parse_from(
|
||||
ts_callback => sub {
|
||||
if ( $self->has_stats ) {
|
||||
$self->{iterations}++
|
||||
$self->{_iterations}++;
|
||||
if ($self->interactive() && $self->{_iterations} >= 2) {
|
||||
my $elapsed =
|
||||
( $self->current_ts() || 0 ) -
|
||||
( $self->first_ts() || 0 );
|
||||
if ( $ts > 0 && $elapsed >= $self->{interval} ) {
|
||||
$self->print_deltas(
|
||||
header_cb => sub {
|
||||
my ($self, @args) = @_;
|
||||
|
||||
if ( $self->{_print_header} ) {
|
||||
my $meth = $args{header_cb} || "print_header";
|
||||
$self->$meth(@args);
|
||||
}
|
||||
$self->{_print_header} = undef;
|
||||
},
|
||||
rest_cb => $args{rest_cb},
|
||||
);
|
||||
|
||||
$self->{_iterations} = -1;
|
||||
return "Stop interactive reading";
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
map({ ($_ => $args{$_}) } qw(filehandle filename data)),
|
||||
);
|
||||
|
||||
if ( $self->{iterations} < 2 ) {
|
||||
if ($self->interactive) {
|
||||
if ($self->{_iterations} == -1 && defined($original_offset) && eof($args{filehandle})) {
|
||||
$self->clear_state;
|
||||
seek $args{filehandle}, $original_offset, 0;
|
||||
}
|
||||
return $lines_read;
|
||||
}
|
||||
|
||||
if ( $self->{_iterations} < 2 ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$self->print_deltas( map( { ( $_ => $args{$_} ) } qw( header_cb rest_cb ) ) );
|
||||
|
||||
$self->clear_state;
|
||||
|
||||
return $lines_read;
|
||||
}
|
||||
|
||||
sub clear_state {
|
||||
my ($self, @args) = @_;
|
||||
$self->{iterations} = 0;
|
||||
my ($self, @args) = @_;
|
||||
$self->{_iterations} = 0;
|
||||
$self->SUPER::clear_state(@args);
|
||||
}
|
||||
|
||||
sub compute_line_ts {
|
||||
my ($self, %args) = @_;
|
||||
return "{" . ($self->{iterations} - 1) . "}";
|
||||
return "{" . ($self->{_iterations} - 1) . "}";
|
||||
}
|
||||
|
||||
sub delta_against {
|
||||
@@ -78,9 +123,14 @@ sub delta_against {
|
||||
return $self->first_stats_for($dev);
|
||||
}
|
||||
|
||||
sub delta_against_ts {
|
||||
my ($self) = @_;
|
||||
return $self->first_ts();
|
||||
}
|
||||
|
||||
sub compute_in_progress {
|
||||
my ($self, $in_progress, $tot_in_progress) = @_;
|
||||
return $tot_in_progress / ($self->{iterations} - 1);
|
||||
return $tot_in_progress / ($self->{_iterations} - 1);
|
||||
}
|
||||
|
||||
1;
|
||||
|
@@ -19,7 +19,7 @@
|
||||
# ###########################################################################
|
||||
{
|
||||
# Package: DiskstatsGroupBySample
|
||||
#
|
||||
#
|
||||
|
||||
package DiskstatsGroupBySample;
|
||||
|
||||
@@ -31,157 +31,155 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
|
||||
use base qw( Diskstats );
|
||||
|
||||
sub new {
|
||||
my ($class, %args) = @_;
|
||||
my ( $class, %args ) = @_;
|
||||
my $self = $class->SUPER::new(%args);
|
||||
$self->{_iterations} = 0;
|
||||
$self->{_interval} = 0;
|
||||
$self->{_save_curr_as_prev} = 0;
|
||||
$self->{_print_header} = 1;
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub group_by {
|
||||
my $self = shift;
|
||||
$self->group_by_sample(@_);
|
||||
}
|
||||
|
||||
# Prints out one line for each disk, summing over the interval from first to
|
||||
# last sample.
|
||||
sub group_by_sample {
|
||||
my ($self, %args) = @_;
|
||||
my ($header_cb, $rest_cb) = $args{ qw( header_cb rest_cb ) };
|
||||
my ( $self, %args ) = @_;
|
||||
my ( $header_cb, $rest_cb ) = $args{qw( header_cb rest_cb )};
|
||||
|
||||
$self->clear_state;
|
||||
|
||||
my $print_header = 1;
|
||||
my $printed_a_line = 0;
|
||||
$self->parse_from(
|
||||
ts_callback => sub {
|
||||
my ($self, $ts) = @_;
|
||||
my $printed_a_line = 0;
|
||||
|
||||
if ( $self->has_stats ) {
|
||||
$self->{_iterations}++;
|
||||
}
|
||||
my $elapsed = ($self->stats_for->{_ts} || 0) - ($self->previous_stats_for->{_ts} || 0);
|
||||
if ( $ts > 0 && $elapsed >= $self->{_interval} ) {
|
||||
|
||||
$self->print_deltas(
|
||||
dev_length => 6,
|
||||
header_cb => sub {
|
||||
my ($self, $header, @args) = @_;
|
||||
if ( $print_header ) {
|
||||
$print_header = 0;
|
||||
if ( my $cb = $args{header_cb} ) {
|
||||
$self->$cb($header, @args);
|
||||
}
|
||||
else {
|
||||
printf { $self->out_fh } $header."\n", @args;
|
||||
}
|
||||
}
|
||||
},
|
||||
rest_cb => sub {
|
||||
my ($self, $format, $cols, $stat) = @_;
|
||||
printf { $self->out_fh } $format."\n", @{$stat}{ qw( line_ts dev ), @$cols };
|
||||
$printed_a_line = 1;
|
||||
}
|
||||
);
|
||||
}
|
||||
if ( $self->{_iterations} == 1 || $printed_a_line == 1 ) {
|
||||
local $self->{_save_curr_as_prev} = 1;
|
||||
$self->_save_current_as_previous();
|
||||
}
|
||||
},
|
||||
map({ ($_ => $args{$_}) } qw(filehandle filename data)),
|
||||
sample_callback =>
|
||||
sub { my ( $self, $ts ) = @_; $self->_sample_callback( $ts, %args ) },
|
||||
map( { ( $_ => $args{$_} ) } qw(filehandle filename data) ),
|
||||
);
|
||||
|
||||
$self->clear_state;
|
||||
}
|
||||
|
||||
sub _sample_callback {
|
||||
my ( $self, $ts, %args ) = @_;
|
||||
my $printed_a_line = 0;
|
||||
|
||||
if ( $self->has_stats ) {
|
||||
$self->{_iterations}++;
|
||||
}
|
||||
|
||||
my $elapsed =
|
||||
( $self->current_ts() || 0 ) -
|
||||
( $self->previous_ts() || 0 );
|
||||
|
||||
if ( $ts > 0 && $elapsed >= $self->{interval} ) {
|
||||
|
||||
$self->print_deltas(
|
||||
max_device_length => 6,
|
||||
header_cb => sub {
|
||||
my ( $self, $header, @args ) = @_;
|
||||
if ( $self->{_print_header} ) {
|
||||
$self->{_print_header} = 0;
|
||||
if ( my $cb = $args{header_cb} ) {
|
||||
$self->$cb( $header, @args );
|
||||
}
|
||||
else {
|
||||
printf { $self->out_fh } $header . "\n", @args;
|
||||
}
|
||||
}
|
||||
},
|
||||
rest_cb => sub {
|
||||
my ( $self, $format, $cols, $stat ) = @_;
|
||||
if ( my $callback = $args{rest_cb} ) {
|
||||
$self->$callback( $format, $cols, $stat );
|
||||
}
|
||||
else {
|
||||
printf { $self->out_fh } $format . "\n",
|
||||
@{$stat}{ qw( line_ts dev ), @$cols };
|
||||
}
|
||||
$printed_a_line = 1;
|
||||
}
|
||||
);
|
||||
}
|
||||
if ( $self->{_iterations} == 1 || $printed_a_line == 1 ) {
|
||||
$self->{_save_curr_as_prev} = 1;
|
||||
$self->_save_current_as_previous( $self->stats_for() );
|
||||
$self->{_save_curr_as_prev} = 0;
|
||||
}
|
||||
}
|
||||
|
||||
sub delta_against {
|
||||
my ($self, $dev) = @_;
|
||||
my ( $self, $dev ) = @_;
|
||||
return $self->previous_stats_for($dev);
|
||||
}
|
||||
|
||||
sub clear_state {
|
||||
my ($self, @args) = @_;
|
||||
$self->{_iterations} = 0;
|
||||
$self->{_save_curr_as_prev} = 0;
|
||||
$self->SUPER::clear_state(@args);
|
||||
sub delta_against_ts {
|
||||
my ( $self ) = @_;
|
||||
return $self->previous_ts();
|
||||
}
|
||||
|
||||
sub compute_line_ts {
|
||||
my ($self, %args) = @_;
|
||||
return $args{first_ts} > 0
|
||||
? sprintf("%5.1f", $args{current_ts} - $args{first_ts})
|
||||
: sprintf("%5.1f", 0);;
|
||||
sub clear_state {
|
||||
my ( $self, @args ) = @_;
|
||||
$self->{_iterations} = 0;
|
||||
$self->{_save_curr_as_prev} = 0;
|
||||
$self->{_print_header} = 1;
|
||||
$self->SUPER::clear_state(@args);
|
||||
}
|
||||
|
||||
sub compute_devs_in_group {
|
||||
my ($self) = @_;
|
||||
return scalar grep 1, @{ $self->stats_for }{ @{$self->sorted_devs} };
|
||||
}
|
||||
|
||||
sub compute_in_progress {
|
||||
my ($self, $in_progress, $tot_in_progress) = @_;
|
||||
return $in_progress;
|
||||
return scalar grep 1, @{ $self->stats_for }{ $self->sorted_devs };
|
||||
}
|
||||
|
||||
sub compute_dev {
|
||||
my ($self, $dev) = @_;
|
||||
my ( $self, $dev ) = @_;
|
||||
return $self->compute_devs_in_group() > 1
|
||||
? "{" . $self->compute_devs_in_group() . "}"
|
||||
: $self->sorted_devs->[0];
|
||||
? "{" . $self->compute_devs_in_group() . "}"
|
||||
: ( $self->sorted_devs )[0];
|
||||
}
|
||||
|
||||
# Terrible breach of encapsulation, but it'll have to do for the moment.
|
||||
sub _calc_deltas {
|
||||
my $self = shift;
|
||||
my ($callback) = @_;
|
||||
|
||||
my $elapsed = $self->stats_for->{_ts} - $self->delta_against->{_ts};
|
||||
die "Time elapsed is 0" unless $elapsed;
|
||||
my @end_stats;
|
||||
sub _calc_stats_for_deltas {
|
||||
my ( $self, $elapsed ) = @_;
|
||||
|
||||
my $delta_for;
|
||||
|
||||
for my $dev ( grep { $self->dev_ok($_) } @{$self->sorted_devs} ) {
|
||||
for my $dev ( grep { $self->dev_ok($_) } $self->sorted_devs ) {
|
||||
my $curr = $self->stats_for($dev);
|
||||
my $against = $self->delta_against($dev);
|
||||
|
||||
my $delta = $self->_calc_delta_for($curr, $against);
|
||||
|
||||
my $delta = $self->_calc_delta_for( $curr, $against );
|
||||
$delta->{ios_in_progress} = $curr->{ios_in_progress};
|
||||
while ( my ($k, $v) = each %$delta ) {
|
||||
while ( my ( $k, $v ) = each %$delta ) {
|
||||
$delta_for->{$k} += $v;
|
||||
}
|
||||
}
|
||||
|
||||
my $in_progress = $delta_for->{ios_in_progress}; #$curr->{"ios_in_progress"};
|
||||
my $tot_in_progress = 0; #$against->{"sum_ios_in_progress"} || 0;
|
||||
my $in_progress = $delta_for->{ios_in_progress}; #$curr->{"ios_in_progress"};
|
||||
my $tot_in_progress = 0; #$against->{"sum_ios_in_progress"} || 0;
|
||||
|
||||
my $devs_in_group = $self->compute_devs_in_group;
|
||||
my $devs_in_group = $self->compute_devs_in_group;
|
||||
|
||||
# Compute the per-second stats for reads, writes, and overall.
|
||||
my %stats = (
|
||||
$self->_calc_read_stats($delta_for, $elapsed, $devs_in_group),
|
||||
$self->_calc_write_stats($delta_for, $elapsed, $devs_in_group),
|
||||
in_progress => $self->compute_in_progress($in_progress, $tot_in_progress),
|
||||
$self->_calc_read_stats( $delta_for, $elapsed, $devs_in_group ),
|
||||
$self->_calc_write_stats( $delta_for, $elapsed, $devs_in_group ),
|
||||
in_progress =>
|
||||
$self->compute_in_progress( $in_progress, $tot_in_progress ),
|
||||
);
|
||||
|
||||
# Compute the numbers for reads and writes together, the things for
|
||||
# which we do not have separate statistics.
|
||||
# Busy is what iostat calls %util. This is the percent of
|
||||
# wall-clock time during which the device has I/O happening.
|
||||
$stats{busy} = 100 * $delta_for->{ms_spent_doing_io} / (1000 * $elapsed * $devs_in_group);
|
||||
$stats{line_ts} = $self->compute_line_ts(
|
||||
first_ts => $self->first_stats_for->{_ts},
|
||||
current_ts => $self->stats_for->{_ts},
|
||||
);
|
||||
|
||||
$stats{dev} = $self->compute_dev(\%stats);
|
||||
|
||||
if ($callback) {
|
||||
$self->$callback( \%stats );
|
||||
my %extras = $self->_calc_misc_stats( $delta_for, $elapsed, $devs_in_group, \%stats );
|
||||
while ( my ($k, $v) = each %extras ) {
|
||||
$stats{$k} = $v;
|
||||
}
|
||||
|
||||
$stats{dev} = $self->compute_dev( \%stats );
|
||||
|
||||
return \%stats;
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
}
|
||||
# ###########################################################################
|
||||
# End DiskstatsGroupBySample package
|
||||
|
@@ -27,12 +27,19 @@ use strict;
|
||||
use English qw(-no_match_vars);
|
||||
use constant MKDEBUG => $ENV{MKDEBUG} || 0;
|
||||
|
||||
use re qw( regexp_pattern );
|
||||
|
||||
use IO::Handle;
|
||||
use IO::Select;
|
||||
use Scalar::Util qw( looks_like_number );
|
||||
use File::Temp qw( tempfile tempdir );
|
||||
|
||||
use ReadKeyMini qw( ReadMode );
|
||||
|
||||
use DiskstatsGroupByAll;
|
||||
use DiskstatsGroupByDisk;
|
||||
use DiskstatsGroupBySample;
|
||||
|
||||
our $VERSION = '0.01';
|
||||
|
||||
my %actions = (
|
||||
@@ -43,31 +50,120 @@ my %actions = (
|
||||
'c' => get_new_x_regex("column_re", "Enter a column pattern: "),
|
||||
'd' => get_new_x_regex("disk_re", "Enter a disk/device pattern: "),
|
||||
'q' => sub { return 'last' },
|
||||
'p' => sub { print "Paused\n"; $_[0]->can_read() },
|
||||
'p' => \&pause,
|
||||
'?' => \&help,
|
||||
);
|
||||
|
||||
sub run {
|
||||
STDOUT->autoflush;
|
||||
STDIN->blocking(0);
|
||||
|
||||
my $sel = IO::Select->new(\*STDIN);
|
||||
my ($self, %args) = @_;
|
||||
|
||||
my %opts = (
|
||||
interval => 1.5,
|
||||
keep_file => undef,
|
||||
samples_to_gather => undef,
|
||||
sample_interval => 3,
|
||||
interval => 0.5,
|
||||
device_regex => qr/sda/,
|
||||
interactive => 1,
|
||||
);
|
||||
|
||||
ReadMode("cbreak");
|
||||
my $dir = tempdir( CLEANUP => 1 );
|
||||
my ($tmp_fh, $filename) = tempfile(
|
||||
"diskstats-samples.XXXXXXXX",
|
||||
DIR => $dir,
|
||||
UNLINK => 1,
|
||||
OPEN => 1,
|
||||
);
|
||||
my $pid = open my $child_fh, "|-";
|
||||
|
||||
if (not defined $pid) {
|
||||
die "Couldn't fork: $OS_ERROR";
|
||||
}
|
||||
|
||||
if ( !$pid ) {
|
||||
# Child
|
||||
|
||||
# Bit of helpful magic: Changes how the program's name is displayed,
|
||||
# so it's easier to track in things like ps.
|
||||
local $PROGRAM_NAME = "$PROGRAM_NAME (data-gathering daemon)";
|
||||
|
||||
close($tmp_fh);
|
||||
|
||||
open my $fh, ">>", $filename or die $!;
|
||||
|
||||
while ( getppid() ) {
|
||||
sleep($opts{sample_interval});
|
||||
open my $diskstats_fh, "<", "/proc/diskstats"
|
||||
or die $!;
|
||||
|
||||
my @to_print = <$diskstats_fh>;
|
||||
push @to_print, `date +'TS %s.%N %F %T'`;
|
||||
|
||||
# Lovely little method from IO::Handle: turns on autoflush,
|
||||
# prints, and then restores the original autoflush state.
|
||||
$fh->printflush(@to_print);
|
||||
|
||||
close $diskstats_fh or die $!;
|
||||
}
|
||||
close $fh or die $!;
|
||||
unlink $filename unless $opts{keep_file};
|
||||
exit(0);
|
||||
}
|
||||
|
||||
STDOUT->autoflush;
|
||||
STDIN->blocking(0);
|
||||
|
||||
my $sel = IO::Select->new(\*STDIN);
|
||||
|
||||
my $lines_read = 0;
|
||||
|
||||
$opts{obj} = DiskstatsGroupByDisk->new(%opts);
|
||||
|
||||
ReadKeyMini::cbreak();
|
||||
warn $filename;
|
||||
MAIN_LOOP:
|
||||
while (1) {
|
||||
if ( $sel->can_read( $opts{interval} ) ) {
|
||||
while (my $got = <STDIN>) { # Should probably be sysread
|
||||
if ($actions{$got}) {
|
||||
last MAIN_LOOP unless $actions{$got}->($sel, \%opts) eq 'last';
|
||||
my $ret = $actions{$got}->(
|
||||
select_obj => $sel,
|
||||
options => \%opts,
|
||||
got => $got,
|
||||
filehandle => $tmp_fh,
|
||||
) || '';
|
||||
last MAIN_LOOP if $ret eq 'last';
|
||||
}
|
||||
}
|
||||
}
|
||||
$lines_read += $opts{obj}->group_by( filehandle => $tmp_fh ) || 0;
|
||||
$tmp_fh->clearerr if eof $tmp_fh;
|
||||
}
|
||||
ReadKeyMini::cooked();
|
||||
kill 9, $pid;
|
||||
close($tmp_fh);
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
my %objects = (
|
||||
D => "DiskstatsGroupByDisk",
|
||||
A => "DiskstatsGroupByAll",
|
||||
S => "DiskstatsGroupBySample",
|
||||
);
|
||||
|
||||
sub group_by {
|
||||
my (%args) = @_;
|
||||
|
||||
my $got = $args{got};
|
||||
|
||||
if ( ref( $args{options}->{obj} ) ne $objects{$got} ) {
|
||||
delete $args{options}->{obj};
|
||||
# This would fail on a stricter constructor, so it probably
|
||||
# needs fixing.
|
||||
$args{options}->{obj} = $objects{$got}->new( %{$args{options}} );
|
||||
}
|
||||
seek $args{filehandle}, 0, 0;
|
||||
}
|
||||
ReadMode("normal");
|
||||
|
||||
}
|
||||
|
||||
@@ -75,22 +171,24 @@ sub get_input {
|
||||
my ($message) = @_;
|
||||
|
||||
STDIN->blocking(1);
|
||||
ReadMode("normal");
|
||||
ReadKeyMini::cooked();
|
||||
|
||||
print $message;
|
||||
chomp(my $new_opt = <STDIN>);
|
||||
|
||||
ReadMode("cbreak");
|
||||
ReadKeyMini::cbreak();
|
||||
STDIN->blocking(0);
|
||||
return $new_opt;
|
||||
}
|
||||
|
||||
sub get_new_interval {
|
||||
my ($args) = @_;
|
||||
my (%args) = @_;
|
||||
my $new_interval = get_input("Enter a redisplay interval: ");
|
||||
|
||||
$new_interval ||= 0;
|
||||
|
||||
if ( looks_like_number($new_interval) ) {
|
||||
$args->{interval} = $new_interval;
|
||||
return $args{options}->{interval} = $new_interval;
|
||||
}
|
||||
else {
|
||||
die("invalid timeout specification");
|
||||
@@ -100,18 +198,18 @@ sub get_new_interval {
|
||||
sub get_new_x_regex {
|
||||
my ($looking_for, $message) = @_;
|
||||
return sub {
|
||||
my ($args) = @_;
|
||||
my (%args) = @_;
|
||||
my $new_regex = get_input($message);
|
||||
|
||||
if ( $new_regex && (my $re = eval { qr/$new_regex/ }) ) {
|
||||
$args->{$looking_for} = $re;
|
||||
if ( $new_regex && (my $re = eval { qr/$new_regex/i }) ) {
|
||||
$args{options}->{$looking_for} = $re;
|
||||
}
|
||||
elsif (!$EVAL_ERROR && !$new_regex) {
|
||||
# This might seem weird, but an empty pattern is
|
||||
# somewhat magical, and basically just asking for trouble.
|
||||
# Instead we give them what awk would, a pattern that always
|
||||
# matches.
|
||||
$args->{$looking_for} = qr/(?=)/;
|
||||
$args{options}->{$looking_for} = qr/(?=)/;
|
||||
}
|
||||
else {
|
||||
die("invalid regex specification: $EVAL_ERROR");
|
||||
@@ -121,7 +219,7 @@ sub get_new_x_regex {
|
||||
|
||||
sub help {
|
||||
# XXX: TODO
|
||||
print <<'HELP'
|
||||
print <<'HELP';
|
||||
You can control this program by key presses:
|
||||
------------------- Key ------------------- ---- Current Setting ----
|
||||
A, D, S) Set the group-by mode \$opt{OPT_g}
|
||||
@@ -133,9 +231,23 @@ sub help {
|
||||
q) Quit the program
|
||||
------------------- Press any key to continue -----------------------
|
||||
HELP
|
||||
pause(@_);
|
||||
}
|
||||
|
||||
sub pause {
|
||||
my (%args) = @_;
|
||||
STDIN->blocking(1);
|
||||
$args{select_obj}->can_read();
|
||||
STDIN->blocking(0);
|
||||
scalar <STDIN>;
|
||||
return;
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
__PACKAGE__->run(@ARGV) unless caller;
|
||||
|
||||
}
|
||||
# ###########################################################################
|
||||
# End DiskstatsMenu package
|
||||
# ###########################################################################
|
||||
# ###########################################################################
|
@@ -111,6 +111,25 @@ my %modes = (
|
||||
|
||||
}
|
||||
|
||||
sub readkey {
|
||||
my $key = '';
|
||||
cbreak();
|
||||
sysread(STDIN, $key, 1);
|
||||
my $timeout = 0.1;
|
||||
if ( $key eq "\033" ) { # Ugly and broken hack, but good enough for the two minutes it took to write.
|
||||
{
|
||||
my $x = '';
|
||||
STDIN->blocking(0);
|
||||
sysread(STDIN, $x, 2);
|
||||
STDIN->blocking(1);
|
||||
$key .= $x;
|
||||
redo if $key =~ /\[[0-2](?:[0-9];)?$/
|
||||
}
|
||||
}
|
||||
cooked();
|
||||
return $key;
|
||||
}
|
||||
|
||||
# As per perlfaq8:
|
||||
|
||||
sub _GetTerminalSize {
|
||||
|
Reference in New Issue
Block a user