[Tools v2] testbot: CompareTaskStatus() is not really needed. Remove it.
Francois Gouget <[email protected]> Mon, 13 Nov 2017 17:06:24 +0100 (CET)
| Newsgroups | gmane.comp.emulators.wine.patches |
|---|---|
| Message-ID | <E1eEHFg-0005Ro-RR@amboise> |
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 <[email protected]> --- Resubmitting. Last time was right before WineConf which may be why it fell through the cracks. 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 c787e8a3..c6eb2900 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -404,11 +404,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 @_; @@ -543,7 +538,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; @@ -591,7 +586,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 $VM = $Task->VM; -- 2.14.2