X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=24c612e073806e1800bbe4113515354dfbdd0334;hb=9b1068374b1a52479b07e1e22b692289d5579237;hp=be3c4f5e2918ccd4bc9395bf0ab19fb72cfd19f0;hpb=3ef87592f37b293b9593bfeefc77c78a8ddbabb3;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..24c612e0 100644
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -1,10 +1,13 @@
-import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
+import {
+  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+} from '../../utils'
 import type { IPool } from '../pool'
 import type { IWorker } from '../worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  TaskStatistics,
+  TaskStatisticsRequirements,
   WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
@@ -12,8 +15,8 @@ import type {
  * Selects the worker with the least ELU.
  *
  * @typeParam Worker - Type of worker which manages the strategy.
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
+ * @typeParam Response - Type of execution response. This can only be structured-cloneable data.
  */
 export class LeastEluWorkerChoiceStrategy<
     Worker extends IWorker,
@@ -23,14 +26,14 @@ 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: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    elu: {
+      aggregate: true,
+      average: false,
+      median: false
+    }
   }
 
   /** @inheritDoc */
@@ -39,7 +42,7 @@ export class LeastEluWorkerChoiceStrategy<
     opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
   ) {
     super(pool, opts)
-    this.setTaskStatistics(this.opts)
+    this.setTaskStatisticsRequirements(this.opts)
   }
 
   /** @inheritDoc */
@@ -54,27 +57,30 @@ export class LeastEluWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
-    // const freeWorkerNodeKey = this.findFreeWorkerNodeKey()
-    // if (freeWorkerNodeKey !== -1) {
-    //   return freeWorkerNodeKey
-    // }
-    let minTasksElu = 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) {
-        return workerNodeKey
-      } else if (tasksElu < minTasksElu) {
-        minTasksElu = tasksElu
-        leastEluWorkerNodeKey = workerNodeKey
-      }
-    }
-    return leastEluWorkerNodeKey
+    this.leastEluNextWorkerNodeKey()
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
   public remove (): boolean {
     return true
   }
+
+  private leastEluNextWorkerNodeKey (): void {
+    let minWorkerElu = Infinity
+    for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
+      const workerUsage = workerNode.usage
+      const workerElu = workerUsage.elu?.active?.aggregate ?? 0
+      if (this.isWorkerNodeReady(workerNodeKey) && workerElu === 0) {
+        this.nextWorkerNodeKey = workerNodeKey
+        break
+      } else if (
+        this.isWorkerNodeReady(workerNodeKey) &&
+        workerElu < minWorkerElu
+      ) {
+        minWorkerElu = workerElu
+        this.nextWorkerNodeKey = workerNodeKey
+      }
+    }
+  }
 }