[Tools] testbot: CompareTaskStatus() is not really needed. Remove it.

Francois Gouget fgouget at codeweavers.com
Tue Oct 24 12:04:17 CDT 2017


The scheduler only cares about queued Tasks so there is no need to
compare their Status fields. So the comparison code can easily be
inlined like for Steps.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 testbot/lib/WineTestBot/Jobs.pm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index b7b2a0a3..f6c19595 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -403,11 +403,6 @@ sub CompareJobPriority
   return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id;
 }
 
-sub CompareTaskStatus
-{
-  return $b->Status cmp $a->Status || $a->No <=> $b->No;
-}
-
 sub min(@)
 {
   my $m = shift @_;
@@ -827,7 +822,7 @@ sub ScheduleOnHost($$$)
       my $PrepareNextStep;
       my $Tasks = $Step->Tasks;
       $Tasks->AddFilter("Status", ["queued"]);
-      my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()};
+      my @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()};
       foreach my $Task (@SortedTasks)
       {
         my $VM = $Task->VM;
@@ -887,7 +882,7 @@ sub ScheduleOnHost($$$)
         my $Step = $SortedSteps[1];
         $Tasks = $Step->Tasks;
         $Tasks->AddFilter("Status", ["queued"]);
-        @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()};
+        @SortedTasks = sort { $a->No <=> $b->No } @{$Tasks->GetItems()};
         foreach my $Task (@SortedTasks)
         {
           my $VMKey = $Task->VM->GetKey();
-- 
2.14.2




More information about the wine-patches mailing list