|
@@ -8,6 +8,7 @@ use strict;
|
|
|
|
|
|
my $mode = '';
|
|
|
my $depth = 0;
|
|
|
+my $numops = 0;
|
|
|
my $who = 0;
|
|
|
my $what = '';
|
|
|
my $setupsize = 0;
|
|
@@ -21,9 +22,10 @@ while(<>) {
|
|
|
$netsetup = "$1 ";
|
|
|
next;
|
|
|
}
|
|
|
- if (/===== Running floram (\S+) (\d+)/) {
|
|
|
+ if (/===== Running floram (\S+) (\d+) (\d+)/) {
|
|
|
$mode = $1;
|
|
|
$depth = $2;
|
|
|
+ $numops = $3;
|
|
|
@seconds = (0,0);
|
|
|
$what = '';
|
|
|
$setupsize = 0;
|
|
@@ -66,12 +68,12 @@ while(<>) {
|
|
|
if (/===== End/) {
|
|
|
my $maxsecs = $seconds[0];
|
|
|
$maxsecs = $seconds[1] if $seconds[1] > $maxsecs;
|
|
|
- print "Floram $mode $depth $netsetup$maxsecs s\n";
|
|
|
+ print "Floram $mode $depth $netsetup$numops $maxsecs s\n";
|
|
|
# The setupsize and opsize are the _sum_ for the two parties, so
|
|
|
# add them to get the total size for both parties, and divide by
|
|
|
# 2 to get the average size for each party
|
|
|
my $bytes = ($setupsize + $opsize) / 2;
|
|
|
my $kib = $bytes / 1024;
|
|
|
- print "Floram $mode $depth $netsetup$kib KiB\n";
|
|
|
+ print "Floram $mode $depth $netsetup$numops $kib KiB\n";
|
|
|
}
|
|
|
}
|