X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=30491dce6fd6962c11547a7fd2494e9a733775da;hb=2c039e4373e86714cdf27e77440b12ee8eb2e4db;hp=f58e3b509e07bdb9de8e6782613bf4207d77674b;hpb=cc750dcada47e9186271e0918b9b0bb8c77ba639;p=poolifier.git

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 f58e3b50..30491dce 100644
--- 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 */
@@ -54,19 +62,19 @@ export class LeastEluWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
-    let minTasksElu = Infinity
-    let leastEluWorkerNodeKey!: number
+    let minWorkerElu = Infinity
     for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
-      const tasksUsage = workerNode.tasksUsage
-      const tasksElu = tasksUsage.elu?.utilization ?? 0
-      if (tasksElu === 0) {
-        return workerNodeKey
-      } else if (tasksElu < minTasksElu) {
-        minTasksElu = tasksElu
-        leastEluWorkerNodeKey = workerNodeKey
+      const workerUsage = workerNode.workerUsage
+      const workerElu = workerUsage.elu?.active.aggregate ?? 0
+      if (workerElu === 0) {
+        this.nextWorkerNodeId = workerNodeKey
+        break
+      } else if (workerElu < minWorkerElu) {
+        minWorkerElu = workerElu
+        this.nextWorkerNodeId = workerNodeKey
       }
     }
-    return leastEluWorkerNodeKey
+    return this.nextWorkerNodeId
   }
 
   /** @inheritDoc */