Account for elapsed (wall clock) time too.

[loba.git] / extract.pl

diff --git a/extract.pl b/extract.pl
index 0521e942065ccfffb3dd1ab7b9d9a231f3ce15ac..c3414ee9946229aec136575d2e93c0de2723d8e5 100755 (executable)
--- a/extract.pl
+++ b/extract.pl
@@ -7,31 +7,14 @@ my $bookkeeping;
 my $flt = '[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?';
 my $pflt = "($flt)";
 my $prefix = '^\[([^: ]+)(?::loba:\(\d+\))? ' . $pflt . '\] \[proc/INFO\] ';
 my $flt = '[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?';
 my $pflt = "($flt)";
 my $prefix = '^\[([^: ]+)(?::loba:\(\d+\))? ' . $pflt . '\] \[proc/INFO\] ';

-my $initmatch = $prefix . 'Initial load: ' . $pflt . '';
-my $finalmatch;
-my $plainmatch;
+my $initmatch = $prefix . 'Initial load: ' . $pflt;
+my $finalmatch = $prefix . 'Final load after (\d+):(\d+) iterations: ' . $pflt;;
+my $plainmatch = $prefix . '\((\d+):(\d+)\) current load: ' . $pflt;

 
 my %alldata = ();
 
 while (<>) {
     chomp;
 
 my %alldata = ();
 
 while (<>) {
     chomp;

-    if (s{^(?:\[0\.0+\] )?\[main/INFO\] \| bookkeeping\.*: }{}) {
-        $bookkeeping = $_ eq "on";
-        $finalmatch = $prefix .
-            'Final load after (\d+):(\d+) iterations: ' . $pflt;
-        $plainmatch = $prefix . '\((\d+):(\d+)\) current load: ' . $pflt;
-        if ($bookkeeping) {
-            $finalmatch = $finalmatch . ' ; expected: ' . $pflt;
-            $plainmatch = $plainmatch . ' ; expected: ' . $pflt;
-        }
-        if (0) {
-            print STDERR "BOOKKEEPING: \"$_\" ($bookkeeping)\n";
-            print STDERR "INITMATCH..: \"$initmatch\"\n";
-            print STDERR "PLAINMATCH.: \"$plainmatch\"\n";
-            print STDERR "FINALMATCH.: \"$finalmatch\"\n";
-        }
-    }
-    next if not defined $bookkeeping;

     if (m{$plainmatch} or m{$finalmatch}) {
         my $host = $1;
         my $data = {
     if (m{$plainmatch} or m{$finalmatch}) {
         my $host = $1;
         my $data = {


@@ -40,11 +23,6 @@ while (<>) {
             comp     => $4,
             load     => $5,
         };
             comp     => $4,
             load     => $5,
         };

-        if ($bookkeeping) {
-            $data->{expected} = $6;
-        } else {
-            $data->{expected} = $data->{load};
-        }

 #        print STDERR "PUSH $host $data->{time} $data->{load} (plain/final)\n";
         push @{$alldata{$host}}, $data;
     } elsif (m{$initmatch}) {
 #        print STDERR "PUSH $host $data->{time} $data->{load} (plain/final)\n";
         push @{$alldata{$host}}, $data;
     } elsif (m{$initmatch}) {


@@ -54,7 +32,6 @@ while (<>) {
             lb       => 0,
             comp     => 0,
             load     => $3,
             lb       => 0,
             comp     => 0,
             load     => $3,

-            expected => $3,

         };
 #        print STDERR "PUSH $host $data->{time} $data->{load} (init)\n";
         push @{$alldata{$host}}, $data;
         };
 #        print STDERR "PUSH $host $data->{time} $data->{load} (init)\n";
         push @{$alldata{$host}}, $data;


@@ -68,5 +45,5 @@ foreach my $host (sort(keys %alldata)) {
     foreach my $data (@{$datalist}) {
         print "$data->{time} $data->{load}\n";
     }
     foreach my $data (@{$datalist}) {
         print "$data->{time} $data->{load}\n";
     }

-    print "\n"
+    print "\n\n"

 }
 }