X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=1af7e6568f19a0705df40014ff404e91645dfd09;hb=3032893add6cc97da7b0600e21df2865ad1f675c;hp=aa751e5437b640ca999ab17c684fc9f32a95882d;hpb=d8a610ca5afeb75608704cddf0093f024134239c;p=poolifier.git

diff --git a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
index aa751e54..1af7e656 100644
--- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@ -1,4 +1,4 @@
-import { cpus } from 'os'
+import { cpus } from 'node:os'
 import type { IPoolInternal } from '../pool-internal'
 import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
@@ -7,7 +7,7 @@ import type { RequiredStatistics } from './selection-strategies-types'
 /**
  * Virtual task runtime.
  */
-type TaskRunTime = {
+interface TaskRunTime {
   weight: number
   runTime: number
 }
@@ -16,24 +16,24 @@ type TaskRunTime = {
  * Selects the next worker with a weighted round robin scheduling algorithm.
  * Loosely modeled after the weighted round robin queueing algorithm: https://en.wikipedia.org/wiki/Weighted_round_robin.
  *
- * @template Worker Type of worker which manages the strategy.
- * @template Data Type of data sent to the worker. This can only be serializable data.
- * @template Response Type of response of execution. This can only be serializable data.
+ * @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 response of execution. This can only be serializable data.
  */
 export class WeightedRoundRobinWorkerChoiceStrategy<
   Worker extends IPoolWorker,
   Data,
   Response
 > extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public readonly requiredStatistics: RequiredStatistics = {
     runTime: true
   }
 
   /**
-   * Worker index where the current task will be submitted.
+   * Worker id where the current task will be submitted.
    */
-  private currentWorkerIndex: number = 0
+  private currentWorkerId: number = 0
   /**
    * Default worker weight.
    */
@@ -42,14 +42,14 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
    * Per worker virtual task runtime map.
    */
   private readonly workersTaskRunTime: Map<Worker, TaskRunTime> = new Map<
-    Worker,
-    TaskRunTime
+  Worker,
+  TaskRunTime
   >()
 
   /**
    * Constructs a worker choice strategy that selects with a weighted round robin scheduling algorithm.
    *
-   * @param pool The pool instance.
+   * @param pool - The pool instance.
    */
   public constructor (pool: IPoolInternal<Worker, Data, Response>) {
     super(pool)
@@ -57,21 +57,19 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
     this.initWorkersTaskRunTime()
   }
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public reset (): boolean {
-    this.currentWorkerIndex = 0
+    this.currentWorkerId = 0
     this.workersTaskRunTime.clear()
     this.initWorkersTaskRunTime()
     return true
   }
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public choose (): Worker {
-    const chosenWorker = this.pool.workers[this.currentWorkerIndex]
-    if (
-      this.isDynamicPool === true &&
-      this.workersTaskRunTime.has(chosenWorker) === false
-    ) {
+    const chosenWorker = this.pool.workers.get(this.currentWorkerId)
+      ?.worker as Worker
+    if (this.isDynamicPool && !this.workersTaskRunTime.has(chosenWorker)) {
       this.initWorkerTaskRunTime(chosenWorker)
     }
     const workerTaskRunTime =
@@ -87,18 +85,22 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
           (this.getWorkerVirtualTaskRunTime(chosenWorker) ?? 0)
       )
     } else {
-      this.currentWorkerIndex =
-        this.currentWorkerIndex === this.pool.workers.length - 1
+      this.currentWorkerId =
+        this.currentWorkerId === this.pool.workers.size - 1
           ? 0
-          : this.currentWorkerIndex + 1
-      this.setWorkerTaskRunTime(chosenWorker, workerTaskWeight, 0)
+          : this.currentWorkerId + 1
+      this.setWorkerTaskRunTime(
+        this.pool.workers.get(this.currentWorkerId)?.worker as Worker,
+        workerTaskWeight,
+        0
+      )
     }
     return chosenWorker
   }
 
   private initWorkersTaskRunTime (): void {
-    for (const worker of this.pool.workers) {
-      this.initWorkerTaskRunTime(worker)
+    for (const value of this.pool.workers.values()) {
+      this.initWorkerTaskRunTime(value.worker)
     }
   }
 
@@ -118,7 +120,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   }
 
   private getWorkerVirtualTaskRunTime (worker: Worker): number | undefined {
-    return this.pool.getWorkerAverageTasksRunTime(worker)
+    return this.pool.getWorkerTasksUsage(worker)?.avgRunTime
   }
 
   private computeWorkerWeight (): number {