X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=35ab69d0ca38595c2f81be566a0b7352bf900e4e;hb=5df69fabd77b3ec4137a6382e2d84791bf0fe85d;hp=be3c4f5e2918ccd4bc9395bf0ab19fb72cfd19f0;hpb=6368f44b560e5a13e2e0323ccfa7d9291ef140dd;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 be3c4f5e..35ab69d0 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,15 @@ export class LeastEluWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
-    // const freeWorkerNodeKey = this.findFreeWorkerNodeKey()
-    // if (freeWorkerNodeKey !== -1) {
-    //   return freeWorkerNodeKey
-    // }
-    let minTasksElu = Infinity
+    let minWorkerElu = Infinity
     let leastEluWorkerNodeKey!: number
     for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
-      const tasksUsage = workerNode.tasksUsage
-      const tasksElu = tasksUsage.elu?.utilization ?? 0
-      if (tasksElu === 0) {
+      const workerUsage = workerNode.workerUsage
+      const workerElu = workerUsage.elu?.active.aggregate ?? 0
+      if (workerElu === 0) {
         return workerNodeKey
-      } else if (tasksElu < minTasksElu) {
-        minTasksElu = tasksElu
+      } else if (workerElu < minWorkerElu) {
+        minWorkerElu = workerElu
         leastEluWorkerNodeKey = workerNodeKey
       }
     }