X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4e922bca67d7cf4bc30a878cd7cd46d39fbe1573..62556b444506565f9a55889f482d8758ca50c3a6:/extract.pl

diff --git a/extract.pl b/extract.pl
index fa393b9..0521e94 100755
--- a/extract.pl
+++ b/extract.pl
@@ -17,17 +17,12 @@ 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 = $prefix .
-                'Final load after (\d+):(\d+) iterations: ' . $pflt .
-                ' ; expected: ' . $pflt;
-            $plainmatch = $prefix .
-                '\((\d+):(\d+)\) current load: ' . $pflt .
-                ' ; expected: ' . $pflt;
-        } else {
-            $finalmatch = $prefix .
-                'Final load after (\d+) iterations: ' . $pflt;
-            $plainmatch = $prefix . '\((\d+)\) current load: ' . $pflt;
+            $finalmatch = $finalmatch . ' ; expected: ' . $pflt;
+            $plainmatch = $plainmatch . ' ; expected: ' . $pflt;
         }
         if (0) {
             print STDERR "BOOKKEEPING: \"$_\" ($bookkeeping)\n";
@@ -37,29 +32,22 @@ while (<>) {
         }
     }
     next if not defined $bookkeeping;
-    if (m{$plainmatch}) {
+    if (m{$plainmatch} or m{$finalmatch}) {
         my $host = $1;
-        my $data;
+        my $data = {
+            time     => $2,
+            lb       => $3,
+            comp     => $4,
+            load     => $5,
+        };
         if ($bookkeeping) {
-            $data = {
-                time     => $2,
-                lb       => $3,
-                comp     => $4,
-                load     => $5,
-                expected => $6,
-            };
+            $data->{expected} = $6;
         } else {
-            $data = {
-                time     => $2,
-                lb       => $3,
-                comp     => $3,
-                load     => $4,
-                expected => $4,
-            };
+            $data->{expected} = $data->{load};
         }
-#        print STDERR "PUSH $host $data->{time} $data->{load} (plain)\n";
+#        print STDERR "PUSH $host $data->{time} $data->{load} (plain/final)\n";
         push @{$alldata{$host}}, $data;
-    } if (m{$initmatch}) {
+    } elsif (m{$initmatch}) {
         my $host = $1;
         my $data = {
             time     => $2,
@@ -70,28 +58,6 @@ while (<>) {
         };
 #        print STDERR "PUSH $host $data->{time} $data->{load} (init)\n";
         push @{$alldata{$host}}, $data;
-    } elsif (m{$finalmatch}) {
-        my $host = $1;
-        my $data;
-        if ($bookkeeping) {
-            $data = {
-                time     => $2,
-                lb       => $3,
-                comp     => $4,
-                load     => $5,
-                expected => $6,
-            };
-         } else {
-             $data = {
-                time     => $2,
-                lb       => $3,
-                comp     => $3,
-                load     => $4,
-                expected => $4,
-             };
-         }
-#        print STDERR "PUSH $host $data->{time} $data->{load} (final)\n";
-        push @{$alldata{$host}}, $data;
     }
 }