Francois Gouget : testbot: Use List::Util::max() instead of reimplementing it.

Alexandre Julliard julliard at winehq.org
Tue Aug 14 13:40:52 CDT 2018


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Aug 10 20:09:43 2018 +0200

testbot: Use List::Util::max() instead of reimplementing it.

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

---

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

diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm
index b3e576a..a8885a4 100644
--- a/testbot/lib/WineTestBot/Activity.pm
+++ b/testbot/lib/WineTestBot/Activity.pm
@@ -28,7 +28,9 @@ WineTestBot::Activity -  reconstruct the TestBot's activity from its history rec
 use Exporter 'import';
 our @EXPORT = qw(GetActivity GetStatistics);
 
+use List::Util qw(max);
 use Scalar::Util qw(weaken);
+
 use WineTestBot::Config;
 use WineTestBot::Jobs;
 use WineTestBot::RecordGroups;
@@ -40,12 +42,6 @@ sub _UpdateMin($$)
   $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]);
 }
 
-sub max($$)
-{
-  my ($a, $b) = @_;
-  return $a > $b ? $a : $b;
-}
-
 
 =pod
 =over 12
@@ -442,8 +438,7 @@ sub GetStatistics($;$)
     # Of course this only works for statistics about VM operations and running
     # tasks (so running.time, reverting.time, etc) not for those about idle or
     # off VMs (idle.time, etc.).
-    $ActivitySeconds = $Seconds + 60 +
-        ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout);
+    $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout);
   }
   my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds);
   $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups};




More information about the wine-cvs mailing list