Replace NULL with nullptr.

[loba.git] / extract.pl

diff --git a/extract.pl b/extract.pl
index a174a9ea03fd8d2c9c0a30765f88912920a20ff5..2862fe99c89c3ef859b242a6691df639b43b6a5e 100755 (executable)
--- a/extract.pl
+++ b/extract.pl
@@ -8,8 +8,8 @@ my $flt = '[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?';
 my $pflt = "($flt)";
 my $prefix = '^\[([^: ]+)(?::loba:\(\d+\))? ' . $pflt . '\] \[proc/INFO\] ';
 my $initmatch = $prefix . 'Initial load: ' . $pflt;
 my $pflt = "($flt)";
 my $prefix = '^\[([^: ]+)(?::loba:\(\d+\))? ' . $pflt . '\] \[proc/INFO\] ';
 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 $finalmatch = $prefix . 'Final load after (\d+):(\d+):(\d+) iterations: ' . $pflt;;
+my $plainmatch = $prefix . '\((\d+):(\d+):(\d+)\) current load: ' . $pflt;

 
 my %alldata = ();
 
 
 my %alldata = ();
 


@@ -21,7 +21,7 @@ while (<>) {
             time     => $2,
             lb       => $3,
             comp     => $4,
             time     => $2,
             lb       => $3,
             comp     => $4,

-            load     => $5,
+            load     => $6,

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


@@ -45,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"

 }
 }