Fixes to the Menu; additionally, changed the accepted format for samples.

Also made it hide rows that are all zeroes by default, as per the blueprint.
2025-09-11 21:51:21 +00:00 · 2011-12-20 12:53:35 -03:00
parent 8da8d1ff61
commit 467254aca3
12 changed files with 730 additions and 593 deletions
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -1,9 +1,49 @@
+#!/usr/local/bin/perl 
 #!/usr/bin/env   perl 
+#!/bin/sh
 
 # This program is part of Percona Toolkit: http://www.percona.com/software/
 # See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
 # notices and disclaimers.

+# The following wrapper was borrowed from Tom Christiansen's Unicode::Tussle.
+
+################################################################
+#
+#   This is an sh wrapper to run the script under
+#   whichever perl occurs first in your path.  See
+#   CHOICEs 1 and 2 below for alternate strategies.
+#   The -x will throw off your line numbers otherwise.
+#
+######################################################################
+#
+#   The next line is legal in both shell and perl,
+#   but perl sees the if 0 so doesn't execute it.
+#
+ 
+eval 'exec perl -x $0 ${1+"$@"}'
+      if 0;
+ 
+### CHOICE 1:
+######################################################################
+### MAKE FOLLOWING #! line THE TOP LINE, REPLACING /usr/local/bin  ###
+###   with wherever you have a late enough version of Perl is      ###
+###   installed.  Will run under 5.8, but the newer the better.    ###
+######################################################################
+#!/usr/local/bin/perl 
+# ^^^^^^^^^^^^^^  <=== CHANGE ME                                   ###
+######################################################################
+ 
+### CHOICE 2:
+######################################################################
+### ALTERNATELY, the following #! line does the same thing as      ###
+###   the tricksy sh eval exec line:  it finds whichever Perl is   ###
+###   first in your path.  However, it works only on BSD systems   ###
+###   (including MacOS), but breaks under Solaris and Linux.       ###
+######################################################################
+#!/usr/bin/env perl
+######################################################################
+
 use strict;
 use warnings FATAL => 'all';
 use constant MKDEBUG => $ENV{MKDEBUG} || 0;
@@ -1623,6 +1663,8 @@ sub new {
   return bless $self, $class;
 }

+# The next lot are accessors, plus some convenience functions.
+
 sub _ts_common {
   my ($self, $key, $val) = @_;
   if ($val) {
@@ -1670,9 +1712,15 @@ sub interactive {
   return $self->{interactive};
 }

+# What this method does is thee-fold:
+# It sets or returns the currently set filehandle, kind of like a poor man's
+# select(); but also, it checks whenever said filehandle is open. If it's not,
+# it defaults to STDOUT.
+
 sub out_fh {
   my ( $self, $new_fh ) = @_;

+                  # ->opened comes from IO::Handle.
   if ( $new_fh && ref($new_fh) && $new_fh->opened ) {
      $self->{out_fh} = $new_fh;
   }
@@ -1726,7 +1774,7 @@ sub add_sorted_devs {
   }
 }

-# clear_stuff methods. LIke the name says, they clear state stored inside
+# clear_stuff methods. Like the name says, they clear state stored inside
 # the object.

 sub clear_state {
@@ -1903,6 +1951,19 @@ my @columns_in_order = (

 }

+# Method: design_print_formats()
+#   What says on the label. Returns three things: the format for the header and the
+#   data, and an arrayref of the columns used to make it.
+#
+# Parameters:
+#   %args - Arguments
+#
+# Optional Arguments:
+#   columns             - An arrayref with column names. If absent, uses ->col_ok to
+#                         decide which columns to use.
+#   max_device_length   - How much space to leave for device names. Defaults at 6.
+#
+
 sub design_print_formats {
   my ( $self,       %args )    = @_;
   my ( $dev_length, $columns ) = @args{qw( max_device_length columns )};
@@ -2038,7 +2099,7 @@ sub parse_from_filename {
 #   run of the mill filehandle.
 #
 # Parameters:
-#   $filehandle      - 
+#   filehandle       - 
 #   sample_callback  - Called each time a sample is processed, passed the latest timestamp.
 #

@@ -2058,7 +2119,7 @@ sub parse_from_data {
   return $lines_read;
 }

-# Method: parse_from()
+# Method: INTERNAL: _load()
 #   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.
@@ -2066,6 +2127,7 @@ sub parse_from_data {
 sub _load {
   my ( $self, $fh, $sample_callback ) = @_;
   my $block_size = $self->block_size;
+   my $current_ts = 0;
   my $new_cur    = {};

   while ( my $line = <$fh> ) {
@@ -2073,17 +2135,18 @@ sub _load {
         $new_cur->{$dev} = $dev_stats;
         $self->add_sorted_devs($dev);
      }
-      elsif ( my ($ts) = $line =~ /TS\s+([0-9]+(?:\.[0-9]+)?)/ ) {
-         if ( %{$new_cur} ) {
+      elsif ( my ($new_ts) = $line =~ /TS\s+([0-9]+(?:\.[0-9]+)?)/ ) {
+         if ( $current_ts && %{$new_cur} ) {
            $self->_save_current_as_previous( $self->stats_for() );
            $self->_save_stats($new_cur);
-            $self->current_ts($ts);
+            $self->current_ts($current_ts);
            $self->_save_current_as_first( dclone($self->stats_for) );
            $new_cur = {};
         }
         if ($sample_callback) {
-            $self->$sample_callback($ts);
+            $self->$sample_callback($current_ts);
         }
+         $current_ts = $new_ts;
      }
      else {
         chomp($line);
@@ -2091,9 +2154,17 @@ sub _load {
      }
   }

+   if ( eof $fh && $current_ts ) {
      if ( %{$new_cur} ) {
-      #$self->_save_stats($new_cur);
+         $self->_save_current_as_previous( $self->stats_for() );
+         $self->_save_stats($new_cur);
+         $self->current_ts($current_ts);
         $self->_save_current_as_first( dclone($self->stats_for) );
+         $new_cur = {};
+      }
+      if ($sample_callback) {
+         $self->$sample_callback($current_ts);
+      }
   }
   # Seems like this could be useful.
   return $INPUT_LINE_NUMBER;
@@ -2106,7 +2177,7 @@ sub _calc_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 / 1024,
-      ios_read_sec    => $delta_for->{ms_spent_reading} * 1000,
+      ios_read_sec    => $delta_for->{ms_spent_reading} / 1000,
      read_conc       => $delta_for->{ms_spent_reading} /
                           $elapsed / 1000 / $devs_in_group,
   );
@@ -2242,7 +2313,7 @@ sub _calc_stats_for_deltas {
 }

 sub _calc_deltas {
-   my ( $self, $callback ) = @_;
+   my ( $self ) = @_;

   my $elapsed = $self->current_ts() - $self->delta_against_ts();
   die "Time elapsed is [$elapsed]" unless $elapsed;
@@ -2795,8 +2866,6 @@ use warnings FATAL => 'all';
 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 blessed );
@@ -2816,8 +2885,8 @@ my %actions = (
   'i' => \&hide_inactive_disks,
   'd' => get_new_value_for( "redisplay_interval", "Enter a new redisplay interval in seconds: " ),
   'z' => get_new_value_for( "sample_time", "Enter a new interval between samples in seconds: " ),
-   'c' => get_new_x_regex( "column_regex", "Enter a column pattern: " ),
-   '/' => get_new_x_regex( "device_regex", "Enter a disk/device pattern: " ),
+   'c' => get_new_regex_for( "column_regex", "Enter a column pattern: " ),
+   '/' => get_new_regex_for( "device_regex", "Enter a disk/device pattern: " ),
   'q' => sub { return 'last' },
   'p' => \&pause,
   '?' => \&help,
@@ -2845,12 +2914,12 @@ sub run_interactive {
      save_samples       => $o->get('save-samples') || undef,
      samples_to_gather  => $o->get('iterations')   || undef,
      sampling_interval  => $o->get('interval')     || 1,
-      display_interval   => 1,
+      redisplay_interval   => 1,
      sample_time        => $o->get('sample-time')  || 1,
      column_regex       => $o->get('columns')      || undef,
      device_regex       => $o->get('devices')      || undef,
      interactive        => 1,
-      filter_zeroed_rows => 0,
+      filter_zeroed_rows => !$o->get('zero-rows'),
   );

   for my $re_key ( grep { $opts{$_} } qw( column_regex device_regex ) ) {
@@ -2901,12 +2970,13 @@ sub run_interactive {
   }

   local $SIG{CHLD} = 'IGNORE';
+   local $SIG{PIPE} = 'IGNORE';

   STDOUT->autoflush;
   STDIN->blocking(0);

   my $sel    = IO::Select->new(\*STDIN);
-   my $class  = $option_to_object{ substr uc($o->get('group-by') || 'Disk'), 0, 1 };
+   my $class  = $option_to_object{ substr ucfirst($o->get('group-by') || 'Disk'), 0, 1 };
   $opts{obj} = $class->new( %opts );

   if ( $args{filename} ) {
@@ -2915,15 +2985,14 @@ sub run_interactive {
         select_obj => $sel,
         options    => \%opts,
         filehandle => $tmp_fh,
-         got        => substr(uc($o->get('group-by') || 'Disk'), 0, 1),
+         got        => substr(ucfirst($o->get('group-by') || 'Disk'), 0, 1),
      );
   }

   ReadKeyMini::cbreak();
   MAIN_LOOP:
   while (1) {
-      if ( $sel->can_read( $opts{display_interval} ) ) {
-         while ( my $got = <STDIN> ) {
+      if ( my $got = read_command_timeout($sel, $opts{redisplay_interval} ) ) {
         if ($actions{$got}) {
            my $ret = $actions{$got}->(
                              select_obj => $sel,
@@ -2934,7 +3003,6 @@ sub run_interactive {
            last MAIN_LOOP if $ret eq 'last';
         }
      }
-      }
      # As a possible source of confusion, note that this calls the group_by
      # _method_ in DiskstatsGroupBySomething, not the group_by _function_
      # defined below.
@@ -2956,25 +3024,39 @@ sub run_interactive {
   ReadKeyMini::cooked();

   if ( !$args{filename} ) {
-      close( $child_fh ) or die "Child error: $?";
-      kill 9, $child_pid;
+      $child_fh->printflush("End\n");
+      waitpid $child_pid, 0;
   }
+
   close($tmp_fh) or die "Couldn't close: $OS_ERROR";
   return;
 }

+sub read_command_timeout {
+   my ($sel, $timeout) = @_;
+   if ( $sel->can_read( $timeout ) ) {
+      return scalar <STDIN>;
+   }
+   return;
+}
+
 sub gather_samples {
   my (%opts)  = @_;
   my $samples = 0;

+   STDIN->blocking(0);
+   my $sel     = IO::Select->new(\*STDIN);
+
   GATHER_DATA:
   while ( $opts{gather_while}->() ) {
-      sleep($opts{sampling_interval});
+      if ( read_command_timeout( $sel, $opts{sampling_interval} ) ) {
+         last GATHER_DATA;
+      }
      open my $diskstats_fh, "<", "/proc/diskstats"
            or die $!;

-      my @to_print = <$diskstats_fh>;
-      push @to_print, `date +'TS %s.%N %F %T'`;
+      my @to_print = `date +'TS %s.%N %F %T'`;
+      push @to_print, <$diskstats_fh>;

      # Lovely little method from IO::Handle: turns on autoflush,
      # prints, and then restores the original autoflush state.
@@ -3007,7 +3089,7 @@ sub group_by {

   # Just aliasing this for a bit.
   for my $obj ( $args{options}->{obj} ) {
-      if ( $option_to_object{$got} eq "DiskstatsGroupBySample" ) {
+      if ( $obj->isa("DiskstatsGroupBySample") ) {
         $obj->interactive(1);
      }
      else {
@@ -3030,6 +3112,25 @@ sub group_by {
   }
 }

+# regexp_pattern is used for pretty-printing regexen, since they can stringify to
+# different things depending on the version of Perl. Unfortunately, 5.8
+# lacks this, so in that version, we put in a facsimile.
+BEGIN {
+   local $EVAL_ERROR;
+
+   eval { require re; re::regexp_pattern(qr//) };
+   if ( $EVAL_ERROR ) {
+      *regexp_pattern = sub {
+            my ($re) = @_;
+            (my $string_re = $re) =~ s/\A\(\?[^:]*?:(.*)\)\z/$1/sm;
+            return $string_re;
+         };
+   }
+   else {
+      re->import("regexp_pattern");
+   }
+}
+
 sub help {
   my (%args)      = @_;
   my $obj         = $args{options}->{obj};
@@ -3037,12 +3138,12 @@ sub help {
   my ($column_re) = regexp_pattern( $obj->column_regex() );
   my ($device_re) = regexp_pattern( $obj->device_regex() );
   my $interval    = $obj->sample_time() || '(none)';
-   my $disp_int    = $args{options}->{display_interval} || '(none)';
-   my $inact_disk  = $obj->filter_zeroed_rows() || '';
+   my $disp_int    = $args{options}->{redisplay_interval} || '(none)';
+   my $inact_disk  = $obj->filter_zeroed_rows() ? 'yes' : 'no';

   for my $re ( $column_re, $device_re ) {
      $re ||= '(none)';
-      $re =~ s/^\Q(?=)\E$//;
+      $re =~ s/^\Q(?=)\E$/(none)/;
   }

   print <<"HELP";
@@ -3052,7 +3153,7 @@ sub help {
   c) Enter a Perl regex to match column names $column_re
   /) Enter a Perl regex to match disk names   $device_re
   z) Set the sample size in seconds           $interval
-   i) Hide/show inactive disks                 $inact_disk
+   i) Hide inactive disks                      $inact_disk
   d) Set the redisplay interval in seconds    $disp_int
   p) Pause the program
   q) Quit the program
@@ -3063,7 +3164,11 @@ HELP

 sub file_to_use {
   my ( $filename ) = @_;
-   #$filename ||= `mktemp -d /tmp/pt-diskstats.$PID.XXXXXXXX`;
+
+   if ( !$filename ) {
+      chomp($filename = `mktemp -t pt-diskstats.$PID.XXXXXXXX`);
+   }
+
   if ( $filename ) {
      open my $fh, "<", $filename
         or die "Couldn't open $filename: $OS_ERROR";
@@ -3072,7 +3177,7 @@ sub file_to_use {
   else {
      local $EVAL_ERROR;
      if ( !eval { require File::Temp } ) {
-         die "Can't call mktemp nor load File::Temp. Please install either of those or pass in an explicit filename.";
+         die "Can't call mktemp nor load File::Temp. Install either of those, or pass in an explicit filename through --save-samples.";
      }
      my $dir = File::Temp::tempdir( CLEANUP => 1 );
      return File::Temp::tempfile(
@@ -3127,7 +3232,7 @@ sub get_new_value_for {
   };
 }

-sub get_new_x_regex {
+sub get_new_regex_for {
   my ($looking_for, $message) = @_;
   return sub {
      my (%args)   = @_;
@@ -3161,9 +3266,6 @@ sub pause {
 }

 1;
-#XXX TODO
-#__PACKAGE__->run_interactive(@ARGV, o => bless {}, "OptionParser") unless caller;
-
 }
 # ###########################################################################
 # End DiskstatsMenu package
@@ -3179,6 +3281,8 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
 use DiskstatsMenu;
 use OptionParser;

+# This gives us a nice little backtrace should an exception happen while
+# debugging is enabled.
 local $SIG{__DIE__} = sub {
   require Carp;
   Carp::confess(@_) unless $^S; # This is $EXCEPTIONS_BEING_CAUGHT
@@ -3259,15 +3363,19 @@ Otherwise it loops until you exit with the 'q' key.
 If you press the '?' key, you will bring up the interactive help menu that
 shows which keys control the program.

-XXX TODO:
-
 Files should have this format:

+   TS <timestamp>  <-- must start with a TS line.
   <contents of /proc/diskstats>
   TS <timestamp>
   <contents of /proc/diskstats>
   ... et cetera
-   TS <timestamp>  <-- must end with a TS line.
+
+Note that previously the format was backwards -- It would put the timestamp
+at the bottom of each sample, not the top. This was doubly troublesome:
+It was inconsistent with how the rest of the Toolkit deals with timestamps,
+and allowed malformed data to sit in the bottom of the file and give incorrect
+results.

 See L<http://aspersa.googlecode.com/svn/html/diskstats.html> for a detailed
 example of using the tool.
@@ -3288,9 +3396,9 @@ the timestamp itself is shown, without the {curly braces}.
 The device name.  If there is more than one device, then instead the number
 of devices aggregated into the line is shown, in {curly braces}.

-=item rd_mb_s
+=item rd_io_s

-The number of megabytes read per second, average, during the sampled interval.
+The number of IO reads per second, average, during the sampled interval.

 =item rd_cnc

@@ -3303,7 +3411,7 @@ The average response time of the read operations, in milliseconds.

 =item wr_mb_s

-Megabytes written per second, average.
+IO writes per second, average.

 =item wr_cnc

@@ -3347,7 +3455,11 @@ The average size of the reads, in kilobytes.
 The percentage of read requests that were merged together in the disk
 scheduler before reaching the device.

-=item wr_s, wr_avgkb, and wr_mrg
+=item rd_mb_s
+
+The number of megabytes read per second, average, during the sampled interval.
+
+=item wr_s, wr_avgkb, and wr_mrg, wr_mb_s

 These are analogous to their C<rd_*> cousins.

@@ -3413,6 +3525,10 @@ type: int; default: 1

 Sample /proc/diskstats every N seconds.

+=item --zero-rows
+
+Show rows with all zero values.
+
 =item --help

 Show help and exit.
@@ -3512,3 +3628,4 @@ pt-diskstats 2.0.0_WIP

 =cut

+__END__
--- a/lib/Diskstats.pm
+++ b/lib/Diskstats.pm
@@ -94,6 +94,8 @@ sub new {
   return bless $self, $class;
 }

+# The next lot are accessors, plus some convenience functions.
+
 sub _ts_common {
   my ($self, $key, $val) = @_;
   if ($val) {
@@ -141,9 +143,15 @@ sub interactive {
   return $self->{interactive};
 }

+# What this method does is thee-fold:
+# It sets or returns the currently set filehandle, kind of like a poor man's
+# select(); but also, it checks whenever said filehandle is open. If it's not,
+# it defaults to STDOUT.
+
 sub out_fh {
   my ( $self, $new_fh ) = @_;

+                  # ->opened comes from IO::Handle.
   if ( $new_fh && ref($new_fh) && $new_fh->opened ) {
      $self->{out_fh} = $new_fh;
   }
@@ -197,7 +205,7 @@ sub add_sorted_devs {
   }
 }

-# clear_stuff methods. LIke the name says, they clear state stored inside
+# clear_stuff methods. Like the name says, they clear state stored inside
 # the object.

 sub clear_state {
@@ -374,6 +382,19 @@ my @columns_in_order = (

 }

+# Method: design_print_formats()
+#   What says on the label. Returns three things: the format for the header and the
+#   data, and an arrayref of the columns used to make it.
+#
+# Parameters:
+#   %args - Arguments
+#
+# Optional Arguments:
+#   columns             - An arrayref with column names. If absent, uses ->col_ok to
+#                         decide which columns to use.
+#   max_device_length   - How much space to leave for device names. Defaults at 6.
+#
+
 sub design_print_formats {
   my ( $self,       %args )    = @_;
   my ( $dev_length, $columns ) = @args{qw( max_device_length columns )};
@@ -509,7 +530,7 @@ sub parse_from_filename {
 #   run of the mill filehandle.
 #
 # Parameters:
-#   $filehandle      - 
+#   filehandle       - 
 #   sample_callback  - Called each time a sample is processed, passed the latest timestamp.
 #

@@ -529,7 +550,7 @@ sub parse_from_data {
   return $lines_read;
 }

-# Method: parse_from()
+# Method: INTERNAL: _load()
 #   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.
@@ -537,6 +558,7 @@ sub parse_from_data {
 sub _load {
   my ( $self, $fh, $sample_callback ) = @_;
   my $block_size = $self->block_size;
+   my $current_ts = 0;
   my $new_cur    = {};

   while ( my $line = <$fh> ) {
@@ -544,17 +566,18 @@ sub _load {
         $new_cur->{$dev} = $dev_stats;
         $self->add_sorted_devs($dev);
      }
-      elsif ( my ($ts) = $line =~ /TS\s+([0-9]+(?:\.[0-9]+)?)/ ) {
-         if ( %{$new_cur} ) {
+      elsif ( my ($new_ts) = $line =~ /TS\s+([0-9]+(?:\.[0-9]+)?)/ ) {
+         if ( $current_ts && %{$new_cur} ) {
            $self->_save_current_as_previous( $self->stats_for() );
            $self->_save_stats($new_cur);
-            $self->current_ts($ts);
+            $self->current_ts($current_ts);
            $self->_save_current_as_first( dclone($self->stats_for) );
            $new_cur = {};
         }
         if ($sample_callback) {
-            $self->$sample_callback($ts);
+            $self->$sample_callback($current_ts);
         }
+         $current_ts = $new_ts;
      }
      else {
         chomp($line);
@@ -562,9 +585,17 @@ sub _load {
      }
   }

+   if ( eof $fh && $current_ts ) {
      if ( %{$new_cur} ) {
-      #$self->_save_stats($new_cur);
+         $self->_save_current_as_previous( $self->stats_for() );
+         $self->_save_stats($new_cur);
+         $self->current_ts($current_ts);
         $self->_save_current_as_first( dclone($self->stats_for) );
+         $new_cur = {};
+      }
+      if ($sample_callback) {
+         $self->$sample_callback($current_ts);
+      }
   }
   # Seems like this could be useful.
   return $INPUT_LINE_NUMBER;
@@ -713,7 +744,7 @@ sub _calc_stats_for_deltas {
 }

 sub _calc_deltas {
-   my ( $self, $callback ) = @_;
+   my ( $self ) = @_;

   my $elapsed = $self->current_ts() - $self->delta_against_ts();
   die "Time elapsed is [$elapsed]" unless $elapsed;
--- a/lib/DiskstatsMenu.pm
+++ b/lib/DiskstatsMenu.pm
@@ -27,8 +27,6 @@ use warnings FATAL => 'all';
 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 blessed );
@@ -48,8 +46,8 @@ my %actions = (
   'i' => \&hide_inactive_disks,
   'd' => get_new_value_for( "redisplay_interval", "Enter a new redisplay interval in seconds: " ),
   'z' => get_new_value_for( "sample_time", "Enter a new interval between samples in seconds: " ),
-   'c' => get_new_x_regex( "column_regex", "Enter a column pattern: " ),
-   '/' => get_new_x_regex( "device_regex", "Enter a disk/device pattern: " ),
+   'c' => get_new_regex_for( "column_regex", "Enter a column pattern: " ),
+   '/' => get_new_regex_for( "device_regex", "Enter a disk/device pattern: " ),
   'q' => sub { return 'last' },
   'p' => \&pause,
   '?' => \&help,
@@ -77,12 +75,12 @@ sub run_interactive {
      save_samples       => $o->get('save-samples') || undef,
      samples_to_gather  => $o->get('iterations')   || undef,
      sampling_interval  => $o->get('interval')     || 1,
-      display_interval   => 1,
+      redisplay_interval   => 1,
      sample_time        => $o->get('sample-time')  || 1,
      column_regex       => $o->get('columns')      || undef,
      device_regex       => $o->get('devices')      || undef,
      interactive        => 1,
-      filter_zeroed_rows => 0,
+      filter_zeroed_rows => !$o->get('zero-rows'),
   );

   for my $re_key ( grep { $opts{$_} } qw( column_regex device_regex ) ) {
@@ -133,12 +131,13 @@ sub run_interactive {
   }

   local $SIG{CHLD} = 'IGNORE';
+   local $SIG{PIPE} = 'IGNORE';

   STDOUT->autoflush;
   STDIN->blocking(0);

   my $sel    = IO::Select->new(\*STDIN);
-   my $class  = $option_to_object{ substr uc($o->get('group-by') || 'Disk'), 0, 1 };
+   my $class  = $option_to_object{ substr ucfirst($o->get('group-by') || 'Disk'), 0, 1 };
   $opts{obj} = $class->new( %opts );

   if ( $args{filename} ) {
@@ -147,15 +146,14 @@ sub run_interactive {
         select_obj => $sel,
         options    => \%opts,
         filehandle => $tmp_fh,
-         got        => substr(uc($o->get('group-by') || 'Disk'), 0, 1),
+         got        => substr(ucfirst($o->get('group-by') || 'Disk'), 0, 1),
      );
   }

   ReadKeyMini::cbreak();
   MAIN_LOOP:
   while (1) {
-      if ( $sel->can_read( $opts{display_interval} ) ) {
-         while ( my $got = <STDIN> ) {
+      if ( my $got = read_command_timeout($sel, $opts{redisplay_interval} ) ) {
         if ($actions{$got}) {
            my $ret = $actions{$got}->(
                              select_obj => $sel,
@@ -166,7 +164,6 @@ sub run_interactive {
            last MAIN_LOOP if $ret eq 'last';
         }
      }
-      }
      # As a possible source of confusion, note that this calls the group_by
      # _method_ in DiskstatsGroupBySomething, not the group_by _function_
      # defined below.
@@ -188,25 +185,39 @@ sub run_interactive {
   ReadKeyMini::cooked();

   if ( !$args{filename} ) {
-      close( $child_fh ) or die "Child error: $?";
-      kill 9, $child_pid;
+      $child_fh->printflush("End\n");
+      waitpid $child_pid, 0;
   }
+
   close($tmp_fh) or die "Couldn't close: $OS_ERROR";
   return;
 }

+sub read_command_timeout {
+   my ($sel, $timeout) = @_;
+   if ( $sel->can_read( $timeout ) ) {
+      return scalar <STDIN>;
+   }
+   return;
+}
+
 sub gather_samples {
   my (%opts)  = @_;
   my $samples = 0;

+   STDIN->blocking(0);
+   my $sel     = IO::Select->new(\*STDIN);
+
   GATHER_DATA:
   while ( $opts{gather_while}->() ) {
-      sleep($opts{sampling_interval});
+      if ( read_command_timeout( $sel, $opts{sampling_interval} ) ) {
+         last GATHER_DATA;
+      }
      open my $diskstats_fh, "<", "/proc/diskstats"
            or die $!;

-      my @to_print = <$diskstats_fh>;
-      push @to_print, `date +'TS %s.%N %F %T'`;
+      my @to_print = `date +'TS %s.%N %F %T'`;
+      push @to_print, <$diskstats_fh>;

      # Lovely little method from IO::Handle: turns on autoflush,
      # prints, and then restores the original autoflush state.
@@ -239,7 +250,7 @@ sub group_by {

   # Just aliasing this for a bit.
   for my $obj ( $args{options}->{obj} ) {
-      if ( $option_to_object{$got} eq "DiskstatsGroupBySample" ) {
+      if ( $obj->isa("DiskstatsGroupBySample") ) {
         $obj->interactive(1);
      }
      else {
@@ -262,6 +273,25 @@ sub group_by {
   }
 }

+# regexp_pattern is used for pretty-printing regexen, since they can stringify to
+# different things depending on the version of Perl. Unfortunately, 5.8
+# lacks this, so in that version, we put in a facsimile.
+BEGIN {
+   local $EVAL_ERROR;
+
+   eval { require re; re::regexp_pattern(qr//) };
+   if ( $EVAL_ERROR ) {
+      *regexp_pattern = sub {
+            my ($re) = @_;
+            (my $string_re = $re) =~ s/\A\(\?[^:]*?:(.*)\)\z/$1/sm;
+            return $string_re;
+         };
+   }
+   else {
+      re->import("regexp_pattern");
+   }
+}
+
 sub help {
   my (%args)      = @_;
   my $obj         = $args{options}->{obj};
@@ -269,12 +299,12 @@ sub help {
   my ($column_re) = regexp_pattern( $obj->column_regex() );
   my ($device_re) = regexp_pattern( $obj->device_regex() );
   my $interval    = $obj->sample_time() || '(none)';
-   my $disp_int    = $args{options}->{display_interval} || '(none)';
-   my $inact_disk  = $obj->filter_zeroed_rows() || '';
+   my $disp_int    = $args{options}->{redisplay_interval} || '(none)';
+   my $inact_disk  = $obj->filter_zeroed_rows() ? 'yes' : 'no';

   for my $re ( $column_re, $device_re ) {
      $re ||= '(none)';
-      $re =~ s/^\Q(?=)\E$//;
+      $re =~ s/^\Q(?=)\E$/(none)/;
   }

   print <<"HELP";
@@ -284,7 +314,7 @@ sub help {
   c) Enter a Perl regex to match column names $column_re
   /) Enter a Perl regex to match disk names   $device_re
   z) Set the sample size in seconds           $interval
-   i) Hide/show inactive disks                 $inact_disk
+   i) Hide inactive disks                      $inact_disk
   d) Set the redisplay interval in seconds    $disp_int
   p) Pause the program
   q) Quit the program
@@ -295,7 +325,11 @@ HELP

 sub file_to_use {
   my ( $filename ) = @_;
-   #$filename ||= `mktemp -d /tmp/pt-diskstats.$PID.XXXXXXXX`;
+
+   if ( !$filename ) {
+      chomp($filename = `mktemp -t pt-diskstats.$PID.XXXXXXXX`);
+   }
+
   if ( $filename ) {
      open my $fh, "<", $filename
         or die "Couldn't open $filename: $OS_ERROR";
@@ -304,7 +338,7 @@ sub file_to_use {
   else {
      local $EVAL_ERROR;
      if ( !eval { require File::Temp } ) {
-         die "Can't call mktemp nor load File::Temp. Please install either of those or pass in an explicit filename.";
+         die "Can't call mktemp nor load File::Temp. Install either of those, or pass in an explicit filename through --save-samples.";
      }
      my $dir = File::Temp::tempdir( CLEANUP => 1 );
      return File::Temp::tempfile(
@@ -359,7 +393,7 @@ sub get_new_value_for {
   };
 }

-sub get_new_x_regex {
+sub get_new_regex_for {
   my ($looking_for, $message) = @_;
   return sub {
      my (%args)   = @_;
@@ -393,9 +427,6 @@ sub pause {
 }

 1;
-#XXX TODO
-#__PACKAGE__->run_interactive(@ARGV, o => bless {}, "OptionParser") unless caller;
-
 }
 # ###########################################################################
 # End DiskstatsMenu package
--- a/lib/pt_diskstats.pm
+++ b/lib/pt_diskstats.pm
@@ -9,6 +9,8 @@ use constant MKDEBUG => $ENV{MKDEBUG} || 0;
 use DiskstatsMenu;
 use OptionParser;

+# This gives us a nice little backtrace should an exception happen while
+# debugging is enabled.
 local $SIG{__DIE__} = sub {
   require Carp;
   Carp::confess(@_) unless $^S; # This is $EXCEPTIONS_BEING_CAUGHT
@@ -89,15 +91,19 @@ Otherwise it loops until you exit with the 'q' key.
 If you press the '?' key, you will bring up the interactive help menu that
 shows which keys control the program.

-XXX TODO:
-
 Files should have this format:

+   TS <timestamp>  <-- must start with a TS line.
   <contents of /proc/diskstats>
   TS <timestamp>
   <contents of /proc/diskstats>
   ... et cetera
-   TS <timestamp>  <-- must end with a TS line.
+
+Note that previously the format was backwards -- It would put the timestamp
+at the bottom of each sample, not the top. This was doubly troublesome:
+It was inconsistent with how the rest of the Toolkit deals with timestamps,
+and allowed malformed data to sit in the bottom of the file and give incorrect
+results.

 See L<http://aspersa.googlecode.com/svn/html/diskstats.html> for a detailed
 example of using the tool.
@@ -118,9 +124,9 @@ the timestamp itself is shown, without the {curly braces}.
 The device name.  If there is more than one device, then instead the number
 of devices aggregated into the line is shown, in {curly braces}.

-=item rd_mb_s
+=item rd_io_s

-The number of megabytes read per second, average, during the sampled interval.
+The number of IO reads per second, average, during the sampled interval.

 =item rd_cnc

@@ -133,7 +139,7 @@ The average response time of the read operations, in milliseconds.

 =item wr_mb_s

-Megabytes written per second, average.
+IO writes per second, average.

 =item wr_cnc

@@ -177,7 +183,11 @@ The average size of the reads, in kilobytes.
 The percentage of read requests that were merged together in the disk
 scheduler before reaching the device.

-=item wr_s, wr_avgkb, and wr_mrg
+=item rd_mb_s
+
+The number of megabytes read per second, average, during the sampled interval.
+
+=item wr_s, wr_avgkb, and wr_mrg, wr_mb_s

 These are analogous to their C<rd_*> cousins.

@@ -243,6 +253,10 @@ type: int; default: 1

 Sample /proc/diskstats every N seconds.

+=item --zero-rows
+
+Show rows with all zero values.
+
 =item --help

 Show help and exit.
--- a/t/lib/Diskstats.t
+++ b/t/lib/Diskstats.t
@@ -252,15 +252,6 @@ is(
   "INTERNAL: _print_header works"
 );

-$obj->current_ts(0);
-$obj->previous_ts(0);
-
-throws_ok(
-   sub { $obj->_calc_deltas() },
-   qr/Time elapsed is/,
-   "->_calc_deltas fails if the time elapsed is 0"
-);
-
 throws_ok(
   sub { $obj->parse_from_data( "ASMFHNASJNFASKLFLKHNSKD" ); },
   qr/isn't in the diskstats format/,
@@ -289,6 +280,8 @@ for my $test (
   my $method = $test->{method};
   my $prefix = $test->{results_file_prefix};

+   $obj->column_regex(qr/ ^ (?!.*io_s$|\s*[qs]time$) /x);
+
   for my $filename ( map "diskstats-00$_.txt", 1..5 ) {
      my $file = File::Spec->catfile( "t", "pt-diskstats", "samples", $filename );
      my $file_with_trunk = File::Spec->catfile( $trunk, $file );
@@ -297,49 +290,37 @@ for my $test (
      
      my $got = output(
         sub {
-            my $orig_re = $obj->column_regex();
-            $obj->column_regex(qr/./);
            $obj->$method(
               filename => $file_with_trunk,
            );
-            $obj->column_regex($orig_re);
         });
      
      is($got, $expected, "$method: $filename via filename");
   
      $got = output(
         sub {
-            my $orig_re = $obj->column_regex();
-            $obj->column_regex(qr/./);
            open my $fh, "<", $file_with_trunk or die $!;
            $obj->$method(
               filehandle => $fh,
            );
-            $obj->column_regex($orig_re);
         });
   
      is($got, $expected, "$method: $filename via filehandle");
   
      $got = output(
         sub {
-            my $orig_re = $obj->column_regex();
-            $obj->column_regex(qr/./);
            $obj->$method(
               data => load_file( $file ),
            );
-            $obj->column_regex($orig_re);
         });
   
      is($got, $expected, "$method: $filename via data");
   
      $got = output(
         sub {
-            my $orig_re = $obj->column_regex();
-            $obj->column_regex(qr/./);
            $obj->$method(
               data => "TS 1298130002.073935000\n" . load_file( $file ),
            );
-            $obj->column_regex($orig_re);
         });
   
      is($got, $expected, "$method: $filename with an extra TS at the top");
@@ -347,13 +328,11 @@ for my $test (
      $obj->filename( $file_with_trunk );
      $got = output(
         sub {
-            my $orig_re = $obj->column_regex();
-            $obj->column_regex(qr/./);
            $obj->$method();
-            $obj->column_regex($orig_re);
         });
   
      is($got, $expected, "$method: $filename via obj->filename()");
+   }

   my $data = <<'EOF';
 TS 1297205887.156653000
@@ -361,15 +340,20 @@ TS 1297205887.156653000
 TS 1297205888.161613000
 EOF

-      $got = output(
+   my $got = output(
   sub{
-         my $orig_re = $obj->column_regex();
-         $obj->column_regex(qr/./);
      $obj->$method(data => $data);
-         $obj->column_regex($orig_re);
   });
   
   ok(!$got, "$method: 1 line of data between two TS lines results in no output");

-   }
+   $obj->current_ts(0);
+   $obj->previous_ts(0);
+   $obj->first_ts(0);
+
+   throws_ok(
+      sub { $obj->_calc_deltas() },
+      qr/Time elapsed is/,
+      "$test->{class}, ->_calc_deltas fails if the time elapsed is 0"
+   );
 }
--- a/t/pt-diskstats/expected/disk_int_diskstats-003.txt
+++ b/t/pt-diskstats/expected/disk_int_diskstats-003.txt
@@ -24,8 +24,8 @@
 {279} sda6           0.0    0.0     4.0     0.0    0.0     0.2   0%      0
 {279} sdb            0.0    0.0     0.0     0.0    0.0     0.0   0%      0
 {279} sdb1           0.0    0.0     0.0     0.0    0.0     0.0   0%      0
-{279} sdc           11.7    1.0     1.3     4.0    0.2     0.6  98%      0
-{279} sdc1          11.7    1.0     1.3     4.0    0.2     0.6  98%      0
+{279} sdc           11.7    0.9     1.3     4.0    0.2     0.6  97%      0
+{279} sdc1          11.7    0.9     1.3     4.0    0.2     0.6  97%      0
 {279} dm-0           0.0    0.0     0.0     0.0    0.0     0.0   0%      0
 {279} dm-1           0.0    0.0     4.0     0.0    0.0     0.4   0%      0
 {279} dm-2           0.0    0.0     0.0     0.0    0.0     0.1   0%      0
@@ -39,4 +39,4 @@
 {279} md0            0.0    0.0     0.0     0.0    0.0     0.0   0%      0
 {279} emcpowera      0.0    0.0     0.0     0.0    0.0     0.0   0%      0
 {279} emcpowera1     0.0    0.0     0.0     0.0    0.0     0.0   0%      0
-{279} dm-7          11.7    1.0     1.3     4.0    0.2     0.6  98%      0
+{279} dm-7          11.7    1.0     1.3     4.0    0.2     0.6  97%      0
--- a/t/pt-diskstats/pt-diskstats.t
+++ b/t/pt-diskstats/pt-diskstats.t
@@ -46,6 +46,7 @@ for my $ext ( qw( all disk sample ) ) {
         pt_diskstats->main(
                  "--group-by" => $ext,
                  "--columns"  => "cnc|rt|mb|busy|prg",
+                  "--zero-rows",
                  $file
               );
      } );
--- a/t/pt-diskstats/samples/diskstats-001.txt
+++ b/t/pt-diskstats/samples/diskstats-001.txt
@@ -1,3 +1,4 @@
+TS 1281367519
 1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
 104    0 cciss/c0d0 2139885 162788 37361471 8034486 17999682 83425310 811400340 12711047 0 6869437 20744582
 104    1 cciss/c0d0p1 1421 3292 10354 3681 351 270 1244 796 0 4271 4477
@@ -6,7 +7,7 @@
 105    0 cciss/c1d0 73924 269836 2753177 412500 2420473 19748 321780475 6652131 0 514459 7064611
 253    0 dm-0 257136 0 3846266 2153516 5512224 0 44097792 3486922 0 1438723 5640971
 9    0 md0 0 0 0 0 0 0 0 0 0 0 0
-TS 1281367519
+TS 1281367521
 1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
 104    0 cciss/c0d0 2139885 162788 37361471 8034486 17999728 83425570 811402788 12711087 0 6869439 20744622
 104    1 cciss/c0d0p1 1421 3292 10354 3681 351 270 1244 796 0 4271 4477
@@ -15,7 +16,7 @@ TS 1281367519
 105    0 cciss/c1d0 73924 269836 2753177 412500 2420473 19748 321780475 6652131 0 514459 7064611
 253    0 dm-0 257136 0 3846266 2153516 5512530 0 44100240 3487167 0 1438725 5641216
 9    0 md0 0 0 0 0 0 0 0 0 0 0 0
-TS 1281367521
+TS 1281367523
 1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
 104    0 cciss/c0d0 2139885 162788 37361471 8034486 17999760 83425680 811403924 12711100 0 6869440 20744635
 104    1 cciss/c0d0p1 1421 3292 10354 3681 351 270 1244 796 0 4271 4477
@@ -24,7 +25,7 @@ TS 1281367521
 105    0 cciss/c1d0 73924 269836 2753177 412500 2420473 19748 321780475 6652131 0 514459 7064611
 253    0 dm-0 257136 0 3846266 2153516 5512530 0 44100240 3487167 0 1438725 5641216
 9    0 md0 0 0 0 0 0 0 0 0 0 0 0
-TS 1281367523
+TS 1281367524
 1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
 104    0 cciss/c0d0 2139885 162788 37361471 8034486 17999764 83425707 811404172 12711100 0 6869440 20744635
 104    1 cciss/c0d0p1 1421 3292 10354 3681 351 270 1244 796 0 4271 4477
@@ -33,7 +34,7 @@ TS 1281367523
 105    0 cciss/c1d0 73924 269836 2753177 412500 2420473 19748 321780475 6652131 0 514459 7064611
 253    0 dm-0 257136 0 3846266 2153516 5512530 0 44100240 3487167 0 1438725 5641216
 9    0 md0 0 0 0 0 0 0 0 0 0 0 0
-TS 1281367524
+TS 1281367526
 1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
 104    0 cciss/c0d0 2139885 162788 37361471 8034486 17999806 83426057 811407308 12711120 0 6869442 20744655
 104    1 cciss/c0d0p1 1421 3292 10354 3681 351 270 1244 796 0 4271 4477
@@ -42,4 +43,3 @@ TS 1281367524
 105    0 cciss/c1d0 73924 269836 2753177 412500 2420473 19748 321780475 6652131 0 514459 7064611
 253    0 dm-0 257136 0 3846266 2153516 5512919 0 44103352 3487398 0 1438727 5641447
 9    0 md0 0 0 0 0 0 0 0 0 0 0 0
-TS 1281367526
--- a/t/pt-diskstats/samples/diskstats-002.txt
+++ b/t/pt-diskstats/samples/diskstats-002.txt
@@ -1,3 +1,4 @@
+TS 1283888686.311660000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -35,7 +36,7 @@
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998364 6091475802 49403812904 2173805747 0 919421180 3016071450
-TS 1283888686.311660000
+TS 1283888687.315692000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -73,7 +74,7 @@ TS 1283888686.311660000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998367 6091475814 49403813024 2173805755 0 919421188 3016071458
-TS 1283888687.315692000
+TS 1283888688.318738000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -111,7 +112,7 @@ TS 1283888687.315692000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998367 6091475814 49403813024 2173805755 0 919421188 3016071458
-TS 1283888688.318738000
+TS 1283888689.321788000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -149,7 +150,7 @@ TS 1283888688.318738000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998367 6091475814 49403813024 2173805755 0 919421188 3016071458
-TS 1283888689.321788000
+TS 1283888690.324766000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -187,7 +188,7 @@ TS 1283888689.321788000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998367 6091475814 49403813024 2173805755 0 919421188 3016071458
-TS 1283888690.324766000
+TS 1283888691.327728000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -225,7 +226,7 @@ TS 1283888690.324766000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998367 6091475814 49403813024 2173805755 0 919421188 3016071458
-TS 1283888691.327728000
+TS 1283888692.330767000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -263,7 +264,7 @@ TS 1283888691.327728000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998370 6091475824 49403813128 2173805759 0 919421192 3016071462
-TS 1283888692.330767000
+TS 1283888693.333816000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -301,7 +302,7 @@ TS 1283888692.330767000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998370 6091475824 49403813128 2173805759 0 919421192 3016071462
-TS 1283888693.333816000
+TS 1283888694.336888000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -339,7 +340,7 @@ TS 1283888693.333816000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998370 6091475824 49403813128 2173805759 0 919421192 3016071462
-TS 1283888694.336888000
+TS 1283888695.339835000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -377,7 +378,7 @@ TS 1283888694.336888000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998370 6091475824 49403813128 2173805759 0 919421192 3016071462
-TS 1283888695.339835000
+TS 1283888696.343012000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -415,7 +416,7 @@ TS 1283888695.339835000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998370 6091475824 49403813128 2173805759 0 919421192 3016071462
-TS 1283888696.343012000
+TS 1283888697.346106000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -453,7 +454,7 @@ TS 1283888696.343012000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998373 6091475829 49403813192 2173805766 0 919421199 3016071469
-TS 1283888697.346106000
+TS 1283888698.349022000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -491,7 +492,7 @@ TS 1283888697.346106000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998373 6091475829 49403813192 2173805766 0 919421199 3016071469
-TS 1283888698.349022000
+TS 1283888699.352069000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -529,7 +530,7 @@ TS 1283888698.349022000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998373 6091475829 49403813192 2173805766 0 919421199 3016071469
-TS 1283888699.352069000
+TS 1283888700.355038000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -567,7 +568,7 @@ TS 1283888699.352069000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998373 6091475829 49403813192 2173805766 0 919421199 3016071469
-TS 1283888700.355038000
+TS 1283888701.358144000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -605,7 +606,7 @@ TS 1283888700.355038000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998373 6091475829 49403813192 2173805766 0 919421199 3016071469
-TS 1283888701.358144000
+TS 1283888702.361159000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -643,7 +644,7 @@ TS 1283888701.358144000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998376 6091475836 49403813272 2173805774 0 919421207 3016071477
-TS 1283888702.361159000
+TS 1283888703.364150000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -681,7 +682,7 @@ TS 1283888702.361159000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998376 6091475836 49403813272 2173805774 0 919421207 3016071477
-TS 1283888703.364150000
+TS 1283888704.367353000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -719,7 +720,7 @@ TS 1283888703.364150000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998376 6091475836 49403813272 2173805774 0 919421207 3016071477
-TS 1283888704.367353000
+TS 1283888705.370218000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -757,7 +758,7 @@ TS 1283888704.367353000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998376 6091475836 49403813272 2173805774 0 919421207 3016071477
-TS 1283888705.370218000
+TS 1283888706.373220000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -795,7 +796,7 @@ TS 1283888705.370218000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998376 6091475836 49403813272 2173805774 0 919421207 3016071477
-TS 1283888706.373220000
+TS 1283888707.376332000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -833,7 +834,7 @@ TS 1283888706.373220000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998379 6091475842 49403813344 2173805782 0 919421215 3016071485
-TS 1283888707.376332000
+TS 1283888708.379355000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -871,7 +872,7 @@ TS 1283888707.376332000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998379 6091475842 49403813344 2173805782 0 919421215 3016071485
-TS 1283888708.379355000
+TS 1283888709.382355000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -909,7 +910,7 @@ TS 1283888708.379355000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998379 6091475842 49403813344 2173805782 0 919421215 3016071485
-TS 1283888709.382355000
+TS 1283888710.385386000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -947,7 +948,7 @@ TS 1283888709.382355000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998379 6091475842 49403813344 2173805782 0 919421215 3016071485
-TS 1283888710.385386000
+TS 1283888711.388398000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -985,7 +986,7 @@ TS 1283888710.385386000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998379 6091475842 49403813344 2173805782 0 919421215 3016071485
-TS 1283888711.388398000
+TS 1283888712.391495000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1023,7 +1024,7 @@ TS 1283888711.388398000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998382 6091475849 49403813424 2173805790 0 919421223 3016071493
-TS 1283888712.391495000
+TS 1283888713.394565000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1061,7 +1062,7 @@ TS 1283888712.391495000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998382 6091475849 49403813424 2173805790 0 919421223 3016071493
-TS 1283888713.394565000
+TS 1283888714.398549000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1099,7 +1100,7 @@ TS 1283888713.394565000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998382 6091475849 49403813424 2173805790 0 919421223 3016071493
-TS 1283888714.398549000
+TS 1283888715.401646000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1137,7 +1138,7 @@ TS 1283888714.398549000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998382 6091475849 49403813424 2173805790 0 919421223 3016071493
-TS 1283888715.401646000
+TS 1283888716.404620000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1175,7 +1176,7 @@ TS 1283888715.401646000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998382 6091475849 49403813424 2173805790 0 919421223 3016071493
-TS 1283888716.404620000
+TS 1283888717.407658000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1213,7 +1214,7 @@ TS 1283888716.404620000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998385 6091475857 49403813512 2173805798 0 919421231 3016071501
-TS 1283888717.407658000
+TS 1283888718.410647000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1251,7 +1252,7 @@ TS 1283888717.407658000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998385 6091475857 49403813512 2173805798 0 919421231 3016071501
-TS 1283888718.410647000
+TS 1283888719.413808000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1289,7 +1290,7 @@ TS 1283888718.410647000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998385 6091475857 49403813512 2173805798 0 919421231 3016071501
-TS 1283888719.413808000
+TS 1283888720.416712000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1327,7 +1328,7 @@ TS 1283888719.413808000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998385 6091475857 49403813512 2173805798 0 919421231 3016071501
-TS 1283888720.416712000
+TS 1283888721.419742000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1365,7 +1366,7 @@ TS 1283888720.416712000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998385 6091475857 49403813512 2173805798 0 919421231 3016071501
-TS 1283888721.419742000
+TS 1283888722.423003000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1403,7 +1404,7 @@ TS 1283888721.419742000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998388 6091475863 49403813584 2173805806 0 919421239 3016071509
-TS 1283888722.423003000
+TS 1283888723.425705000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1441,7 +1442,7 @@ TS 1283888722.423003000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998388 6091475863 49403813584 2173805806 0 919421239 3016071509
-TS 1283888723.425705000
+TS 1283888724.428918000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1479,7 +1480,7 @@ TS 1283888723.425705000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998388 6091475863 49403813584 2173805806 0 919421239 3016071509
-TS 1283888724.428918000
+TS 1283888725.431905000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1517,7 +1518,7 @@ TS 1283888724.428918000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998388 6091475863 49403813584 2173805806 0 919421239 3016071509
-TS 1283888725.431905000
+TS 1283888726.434904000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1555,7 +1556,7 @@ TS 1283888725.431905000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998388 6091475863 49403813584 2173805806 0 919421239 3016071509
-TS 1283888726.434904000
+TS 1283888727.438053000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1593,7 +1594,7 @@ TS 1283888726.434904000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998391 6091475871 49403813672 2173805811 0 919421244 3016071514
-TS 1283888727.438053000
+TS 1283888728.441039000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1631,7 +1632,7 @@ TS 1283888727.438053000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998391 6091475871 49403813672 2173805811 0 919421244 3016071514
-TS 1283888728.441039000
+TS 1283888729.444051000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1669,7 +1670,7 @@ TS 1283888728.441039000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998391 6091475871 49403813672 2173805811 0 919421244 3016071514
-TS 1283888729.444051000
+TS 1283888730.447082000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1707,7 +1708,7 @@ TS 1283888729.444051000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998391 6091475871 49403813672 2173805811 0 919421244 3016071514
-TS 1283888730.447082000
+TS 1283888731.450143000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1745,7 +1746,7 @@ TS 1283888730.447082000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998391 6091475871 49403813672 2173805811 0 919421244 3016071514
-TS 1283888731.450143000
+TS 1283888732.453184000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1783,7 +1784,7 @@ TS 1283888731.450143000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998394 6091475879 49403813760 2173805819 0 919421252 3016071522
-TS 1283888732.453184000
+TS 1283888733.456212000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1821,7 +1822,7 @@ TS 1283888732.453184000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998394 6091475879 49403813760 2173805819 0 919421252 3016071522
-TS 1283888733.456212000
+TS 1283888734.459239000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1859,7 +1860,7 @@ TS 1283888733.456212000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998394 6091475879 49403813760 2173805819 0 919421252 3016071522
-TS 1283888734.459239000
+TS 1283888735.462204000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1897,7 +1898,7 @@ TS 1283888734.459239000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998394 6091475879 49403813760 2173805819 0 919421252 3016071522
-TS 1283888735.462204000
+TS 1283888736.465309000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1935,7 +1936,7 @@ TS 1283888735.462204000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998394 6091475879 49403813760 2173805819 0 919421252 3016071522
-TS 1283888736.465309000
+TS 1283888737.468327000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -1973,7 +1974,7 @@ TS 1283888736.465309000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998397 6091475886 49403813840 2173805827 0 919421260 3016071530
-TS 1283888737.468327000
+TS 1283888738.471226000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2011,7 +2012,7 @@ TS 1283888737.468327000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998397 6091475886 49403813840 2173805827 0 919421260 3016071530
-TS 1283888738.471226000
+TS 1283888739.474425000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2049,7 +2050,7 @@ TS 1283888738.471226000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998397 6091475886 49403813840 2173805827 0 919421260 3016071530
-TS 1283888739.474425000
+TS 1283888740.477453000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2087,7 +2088,7 @@ TS 1283888739.474425000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998397 6091475886 49403813840 2173805827 0 919421260 3016071530
-TS 1283888740.477453000
+TS 1283888741.480460000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2125,7 +2126,7 @@ TS 1283888740.477453000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998397 6091475886 49403813840 2173805827 0 919421260 3016071530
-TS 1283888741.480460000
+TS 1283888742.483488000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2163,7 +2164,7 @@ TS 1283888741.480460000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998400 6091475894 49403813928 2173805835 0 919421268 3016071538
-TS 1283888742.483488000
+TS 1283888743.486506000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2201,7 +2202,7 @@ TS 1283888742.483488000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998400 6091475894 49403813928 2173805835 0 919421268 3016071538
-TS 1283888743.486506000
+TS 1283888744.489626000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2239,7 +2240,7 @@ TS 1283888743.486506000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998400 6091475894 49403813928 2173805835 0 919421268 3016071538
-TS 1283888744.489626000
+TS 1283888745.492536000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2277,7 +2278,7 @@ TS 1283888744.489626000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998400 6091475894 49403813928 2173805835 0 919421268 3016071538
-TS 1283888745.492536000
+TS 1283888746.495604000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2315,7 +2316,7 @@ TS 1283888745.492536000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998400 6091475894 49403813928 2173805835 0 919421268 3016071538
-TS 1283888746.495604000
+TS 1283888747.498678000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2353,7 +2354,7 @@ TS 1283888746.495604000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998403 6091475910 49403814080 2173805843 0 919421276 3016071546
-TS 1283888747.498678000
+TS 1283888748.501719000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2391,7 +2392,7 @@ TS 1283888747.498678000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998403 6091475910 49403814080 2173805843 0 919421276 3016071546
-TS 1283888748.501719000
+TS 1283888749.504663000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2429,7 +2430,7 @@ TS 1283888748.501719000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998403 6091475910 49403814080 2173805843 0 919421276 3016071546
-TS 1283888749.504663000
+TS 1283888750.507755000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2467,7 +2468,7 @@ TS 1283888749.504663000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998403 6091475910 49403814080 2173805843 0 919421276 3016071546
-TS 1283888750.507755000
+TS 1283888751.510735000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2505,7 +2506,7 @@ TS 1283888750.507755000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998403 6091475910 49403814080 2173805843 0 919421276 3016071546
-TS 1283888751.510735000
+TS 1283888752.513820000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2543,7 +2544,7 @@ TS 1283888751.510735000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998406 6091475920 49403814184 2173805850 0 919421283 3016071553
-TS 1283888752.513820000
+TS 1283888753.516927000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2581,7 +2582,7 @@ TS 1283888752.513820000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998406 6091475920 49403814184 2173805850 0 919421283 3016071553
-TS 1283888753.516927000
+TS 1283888754.519895000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2619,7 +2620,7 @@ TS 1283888753.516927000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998406 6091475920 49403814184 2173805850 0 919421283 3016071553
-TS 1283888754.519895000
+TS 1283888755.523853000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2657,7 +2658,7 @@ TS 1283888754.519895000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998406 6091475920 49403814184 2173805850 0 919421283 3016071553
-TS 1283888755.523853000
+TS 1283888756.527123000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2695,7 +2696,7 @@ TS 1283888755.523853000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998406 6091475920 49403814184 2173805850 0 919421283 3016071553
-TS 1283888756.527123000
+TS 1283888757.530021000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2733,7 +2734,7 @@ TS 1283888756.527123000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998409 6091475929 49403814280 2173805858 0 919421291 3016071561
-TS 1283888757.530021000
+TS 1283888758.533877000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2771,7 +2772,7 @@ TS 1283888757.530021000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998409 6091475929 49403814280 2173805858 0 919421291 3016071561
-TS 1283888758.533877000
+TS 1283888759.537039000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2809,7 +2810,7 @@ TS 1283888758.533877000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998409 6091475929 49403814280 2173805858 0 919421291 3016071561
-TS 1283888759.537039000
+TS 1283888760.540063000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2847,7 +2848,7 @@ TS 1283888759.537039000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998409 6091475929 49403814280 2173805858 0 919421291 3016071561
-TS 1283888760.540063000
+TS 1283888761.543043000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2885,7 +2886,7 @@ TS 1283888760.540063000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998409 6091475929 49403814280 2173805858 0 919421291 3016071561
-TS 1283888761.543043000
+TS 1283888762.546261000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2923,7 +2924,7 @@ TS 1283888761.543043000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998412 6091475936 49403814360 2173805863 0 919421296 3016071566
-TS 1283888762.546261000
+TS 1283888763.549036000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2961,7 +2962,7 @@ TS 1283888762.546261000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998412 6091475936 49403814360 2173805863 0 919421296 3016071566
-TS 1283888763.549036000
+TS 1283888764.552166000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -2999,7 +3000,7 @@ TS 1283888763.549036000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998412 6091475936 49403814360 2173805863 0 919421296 3016071566
-TS 1283888764.552166000
+TS 1283888765.555200000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3037,7 +3038,7 @@ TS 1283888764.552166000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998412 6091475936 49403814360 2173805863 0 919421296 3016071566
-TS 1283888765.555200000
+TS 1283888766.558348000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3075,7 +3076,7 @@ TS 1283888765.555200000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998412 6091475936 49403814360 2173805863 0 919421296 3016071566
-TS 1283888766.558348000
+TS 1283888767.561316000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3113,7 +3114,7 @@ TS 1283888766.558348000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998415 6091475942 49403814432 2173805870 0 919421303 3016071573
-TS 1283888767.561316000
+TS 1283888768.564352000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3151,7 +3152,7 @@ TS 1283888767.561316000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998415 6091475942 49403814432 2173805870 0 919421303 3016071573
-TS 1283888768.564352000
+TS 1283888769.567331000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3189,7 +3190,7 @@ TS 1283888768.564352000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998415 6091475942 49403814432 2173805870 0 919421303 3016071573
-TS 1283888769.567331000
+TS 1283888770.570462000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3227,7 +3228,7 @@ TS 1283888769.567331000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998415 6091475942 49403814432 2173805870 0 919421303 3016071573
-TS 1283888770.570462000
+TS 1283888771.573425000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3265,7 +3266,7 @@ TS 1283888770.570462000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998415 6091475942 49403814432 2173805870 0 919421303 3016071573
-TS 1283888771.573425000
+TS 1283888772.576428000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3303,7 +3304,7 @@ TS 1283888771.573425000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998418 6091475950 49403814520 2173805877 0 919421310 3016071580
-TS 1283888772.576428000
+TS 1283888773.579616000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3341,7 +3342,7 @@ TS 1283888772.576428000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998418 6091475950 49403814520 2173805877 0 919421310 3016071580
-TS 1283888773.579616000
+TS 1283888774.582501000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3379,7 +3380,7 @@ TS 1283888773.579616000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998418 6091475950 49403814520 2173805877 0 919421310 3016071580
-TS 1283888774.582501000
+TS 1283888775.585489000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3417,7 +3418,7 @@ TS 1283888774.582501000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998418 6091475950 49403814520 2173805877 0 919421310 3016071580
-TS 1283888775.585489000
+TS 1283888776.588589000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3455,7 +3456,7 @@ TS 1283888775.585489000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998418 6091475950 49403814520 2173805877 0 919421310 3016071580
-TS 1283888776.588589000
+TS 1283888777.591813000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3493,7 +3494,7 @@ TS 1283888776.588589000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998421 6091475959 49403814616 2173805885 0 919421318 3016071588
-TS 1283888777.591813000
+TS 1283888778.595678000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3531,7 +3532,7 @@ TS 1283888777.591813000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998421 6091475959 49403814616 2173805885 0 919421318 3016071588
-TS 1283888778.595678000
+TS 1283888779.598720000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3569,7 +3570,7 @@ TS 1283888778.595678000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998421 6091475959 49403814616 2173805885 0 919421318 3016071588
-TS 1283888779.598720000
+TS 1283888780.601825000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3607,7 +3608,7 @@ TS 1283888779.598720000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998421 6091475959 49403814616 2173805885 0 919421318 3016071588
-TS 1283888780.601825000
+TS 1283888781.604717000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3645,7 +3646,7 @@ TS 1283888780.601825000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998421 6091475959 49403814616 2173805885 0 919421318 3016071588
-TS 1283888781.604717000
+TS 1283888782.608014000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3683,7 +3684,7 @@ TS 1283888781.604717000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998424 6091475969 49403814720 2173805892 0 919421325 3016071595
-TS 1283888782.608014000
+TS 1283888783.610722000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3721,7 +3722,7 @@ TS 1283888782.608014000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998424 6091475969 49403814720 2173805892 0 919421325 3016071595
-TS 1283888783.610722000
+TS 1283888784.613984000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3759,7 +3760,7 @@ TS 1283888783.610722000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998424 6091475969 49403814720 2173805892 0 919421325 3016071595
-TS 1283888784.613984000
+TS 1283888785.616937000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3797,7 +3798,7 @@ TS 1283888784.613984000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998424 6091475969 49403814720 2173805892 0 919421325 3016071595
-TS 1283888785.616937000
+TS 1283888786.619866000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3835,7 +3836,7 @@ TS 1283888785.616937000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998424 6091475969 49403814720 2173805892 0 919421325 3016071595
-TS 1283888786.619866000
+TS 1283888787.623034000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -3873,4 +3874,3 @@ TS 1283888786.619866000
  11    1 sr1 0 0 0 0 0 0 0 0 0 0 0
   9    0 md0 0 0 0 0 0 0 0 0 0 0 0
 120    0 emcpowera 323046912 502722235 134965691962 842254915 83998427 6091476005 49403815032 2173805899 0 919421332 3016071602
-TS 1283888787.623034000
--- a/t/pt-diskstats/samples/diskstats-003.txt
+++ b/t/pt-diskstats/samples/diskstats-003.txt
--- a/t/pt-diskstats/samples/diskstats-004.txt
+++ b/t/pt-diskstats/samples/diskstats-004.txt
@@ -1,3 +1,4 @@
+TS 1298130003.073935000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -28,7 +29,7 @@
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130003.073935000
+TS 1298130004.088149000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -59,7 +60,7 @@ TS 1298130003.073935000
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130004.088149000
+TS 1298130005.102035000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -90,7 +91,7 @@ TS 1298130004.088149000
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130005.102035000
+TS 1298130006.116158000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -121,7 +122,7 @@ TS 1298130005.102035000
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130006.116158000
+TS 1298130007.131062000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -152,7 +153,7 @@ TS 1298130006.116158000
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130007.131062000
+TS 1298130008.145277000
   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
   1    1 ram1 0 0 0 0 0 0 0 0 0 0 0
   1    2 ram2 0 0 0 0 0 0 0 0 0 0 0
@@ -183,4 +184,3 @@ TS 1298130007.131062000
   7    5 loop5 0 0 0 0 0 0 0 0 0 0 0
   7    6 loop6 0 0 0 0 0 0 0 0 0 0 0
   7    7 loop7 0 0 0 0 0 0 0 0 0 0 0
-TS 1298130008.145277000
--- a/t/pt-diskstats/samples/diskstats-005.txt
+++ b/t/pt-diskstats/samples/diskstats-005.txt
@@ -1,18 +1,18 @@
+TS 1298130003.073935000
   8    3 sda3 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
   8    3 sda4 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
-TS 1298130003.073935000
+TS 1298130004.088149000
   8    3 sda3 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
   8    3 sda4 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
-TS 1298130004.088149000
+TS 1298130005.102035000
   8    3 sda3 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
   8    3 sda4 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
-TS 1298130005.102035000
+TS 1298130006.116158000
   8    3 sda3 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
   8    3 sda4 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
-TS 1298130006.116158000
+TS 1298130007.131062000
   8    3 sda3 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
   8    3 sda4 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
-TS 1298130007.131062000
+TS 1298130008.145277000
   8    3 sda3 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
   8    3 sda4 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
-TS 1298130008.145277000