Francois Gouget : testbot: Don' t include incomplete VM operations in statistics.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 31ba0abf4f232c8dd174824c469408634d459ba4
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=31ba0abf4f232c8dd174824c469408634d459ba4

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Feb  8 12:10:03 2018 +0100

testbot: Don't include incomplete VM operations in statistics.

Including a revert operation that started a couple of seconds ago but
has not yet completed in the average revert time would distort the
result (particularly if restricting the analysis to the recent past).

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/WineTestBot/Activity.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm
index c04a1e4..5122dc3 100644
--- a/testbot/lib/WineTestBot/Activity.pm
+++ b/testbot/lib/WineTestBot/Activity.pm
@@ -311,6 +311,7 @@ sub GetActivity($;$)
     my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name};
     next if (!$LastVMStatus);
     $LastVMStatus->{end} = $Counters->{now};
+    $LastVMStatus->{ongoing} = 1;
     if ($LastVMStatus->{status} eq "unknown")
     {
       $LastVMStatus->{status} = $VM->Status;
@@ -422,8 +423,11 @@ sub GetStatistics($)
         my $Status = $VMStatus->{status};
 
         my $Time = $VMStatus->{end} - $VMStatus->{start};
-        _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id});
-        _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id});
+        if (!$VMStatus->{ongoing})
+        {
+          _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id});
+          _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id});
+        }
         if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/)
         {
           $VMStats->{"busy.elapsed"} += $Time;