X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=0f992cfaf82d17794def8c9a129dacf91075f2ec;hb=f6bc9f26d8a0246bbee14b2b03d0bcc41b8aeb52;hp=5cc02bffbc58997dc872ad023f13f7308a903640;hpb=4eb9e75a6d47a08541d38b70505e5ba1126aa2f1;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 5cc02bff..0f992cfa 100644
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -1,4 +1,7 @@
-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'
@@ -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,
@@ -24,17 +27,13 @@ export class LeastEluWorkerChoiceStrategy<
   implements IWorkerChoiceStrategy {
   /** @inheritDoc */
   public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
-    runTime: {
-      aggregate: false,
+    runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    elu: {
+      aggregate: true,
       average: false,
       median: false
-    },
-    waitTime: {
-      aggregate: false,
-      average: false,
-      median: false
-    },
-    elu: true
+    }
   }
 
   /** @inheritDoc */
@@ -57,24 +56,34 @@ 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
-      if (workerElu === 0) {
-        return workerNodeKey
-      } else if (workerElu < minWorkerElu) {
-        minWorkerElu = workerElu
-        leastEluWorkerNodeKey = workerNodeKey
-      }
-    }
-    return leastEluWorkerNodeKey
+  public choose (): number | undefined {
+    const chosenWorkerNodeKey = this.leastEluNextWorkerNodeKey()
+    this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
   public remove (): boolean {
     return true
   }
+
+  private leastEluNextWorkerNodeKey (): number | undefined {
+    let minWorkerElu = Infinity
+    let chosenWorkerNodeKey: number | undefined
+    for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
+      const workerUsage = workerNode.usage
+      const workerElu = workerUsage.elu?.active?.aggregate ?? 0
+      if (this.isWorkerNodeEligible(workerNodeKey) && workerElu === 0) {
+        chosenWorkerNodeKey = workerNodeKey
+        break
+      } else if (
+        this.isWorkerNodeEligible(workerNodeKey) &&
+        workerElu < minWorkerElu
+      ) {
+        minWorkerElu = workerElu
+        chosenWorkerNodeKey = workerNodeKey
+      }
+    }
+    return chosenWorkerNodeKey
+  }
 }