test: cleanup helpers

[poolifier.git] / src / pools / selection-strategies / least-elu-worker-choice-strategy.ts

diff --git a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
index 41ebf7fb4c5a47d241410aa28cf52d9c4ae44d23..30491dce6fd6962c11547a7fd2494e9a733775da 100644 (file)
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -4,7 +4,7 @@ import type { IWorker } from '../worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  TaskStatistics,
+  TaskStatisticsRequirements,
   WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
@@ -23,14 +23,22 @@ export class LeastEluWorkerChoiceStrategy<
   extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
   implements IWorkerChoiceStrategy {
   /** @inheritDoc */
-  public readonly taskStatistics: TaskStatistics = {
-    runTime: false,
-    avgRunTime: true,
-    medRunTime: false,
-    waitTime: false,
-    avgWaitTime: false,
-    medWaitTime: false,
-    elu: true
+  public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
+    runTime: {
+      aggregate: false,
+      average: false,
+      median: false
+    },
+    waitTime: {
+      aggregate: false,
+      average: false,
+      median: false
+    },
+    elu: {
+      aggregate: true,
+      average: false,
+      median: false
+    }
   }
 
   /** @inheritDoc */
@@ -39,7 +47,7 @@ export class LeastEluWorkerChoiceStrategy<
     opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
   ) {
     super(pool, opts)
-    this.setTaskStatistics(this.opts)
+    this.setTaskStatisticsRequirements(this.opts)
   }
 
   /** @inheritDoc */
@@ -55,18 +63,18 @@ export class LeastEluWorkerChoiceStrategy<
   /** @inheritDoc */
   public choose (): number {
     let minWorkerElu = Infinity
-    let leastEluWorkerNodeKey!: number
     for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
       const workerUsage = workerNode.workerUsage
-      const workerElu = workerUsage.elu?.utilization ?? 0
+      const workerElu = workerUsage.elu?.active.aggregate ?? 0
       if (workerElu === 0) {
-        return workerNodeKey
+        this.nextWorkerNodeId = workerNodeKey
+        break
       } else if (workerElu < minWorkerElu) {
         minWorkerElu = workerElu
-        leastEluWorkerNodeKey = workerNodeKey
+        this.nextWorkerNodeId = workerNodeKey
       }
     }
-    return leastEluWorkerNodeKey
+    return this.nextWorkerNodeId
   }
 
   /** @inheritDoc */