X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=7415cf4e34ccc1ac9bbd68e7d7098ba70030f633;hb=3032893add6cc97da7b0600e21df2865ad1f675c;hp=48f213ffebb1a4577debff4e701ef45f53e2ebed;hpb=11df35903da6f581c45e8b42e1d4fbd342bddc3c;p=poolifier.git

diff --git a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
index 48f213ff..7415cf4e 100644
--- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@ -5,7 +5,7 @@ import type { RequiredStatistics } from './selection-strategies-types'
 /**
  * Worker virtual task timestamp.
  */
-type WorkerVirtualTaskTimestamp = {
+interface WorkerVirtualTaskTimestamp {
   start: number
   end: number
 }
@@ -14,16 +14,16 @@ type WorkerVirtualTaskTimestamp = {
  * Selects the next worker with a fair share scheduling algorithm.
  * Loosely modeled after the fair queueing algorithm: https://en.wikipedia.org/wiki/Fair_queuing.
  *
- * @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 FairShareWorkerChoiceStrategy<
   Worker extends IPoolWorker,
   Data,
   Response
 > extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public readonly requiredStatistics: RequiredStatistics = {
     runTime: true
   }
@@ -32,21 +32,22 @@ export class FairShareWorkerChoiceStrategy<
    *  Worker last virtual task execution timestamp.
    */
   private readonly workerLastVirtualTaskTimestamp: Map<
-    Worker,
-    WorkerVirtualTaskTimestamp
+  Worker,
+  WorkerVirtualTaskTimestamp
   > = new Map<Worker, WorkerVirtualTaskTimestamp>()
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public reset (): boolean {
     this.workerLastVirtualTaskTimestamp.clear()
     return true
   }
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public choose (): Worker {
     let minWorkerVirtualTaskEndTimestamp = Infinity
     let chosenWorker!: Worker
-    for (const worker of this.pool.workers) {
+    for (const value of this.pool.workers.values()) {
+      const worker = value.worker
       this.computeWorkerLastVirtualTaskTimestamp(worker)
       const workerLastVirtualTaskEndTimestamp =
         this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? 0
@@ -63,19 +64,18 @@ export class FairShareWorkerChoiceStrategy<
   /**
    * Computes worker last virtual task timestamp.
    *
-   * @param worker The worker.
+   * @param worker - The worker.
    */
   private computeWorkerLastVirtualTaskTimestamp (worker: Worker): void {
     const workerVirtualTaskStartTimestamp = Math.max(
       Date.now(),
       this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? -Infinity
     )
-    const workerVirtualTaskEndTimestamp =
-      workerVirtualTaskStartTimestamp +
-      (this.pool.getWorkerAverageTasksRunTime(worker) ?? 0)
     this.workerLastVirtualTaskTimestamp.set(worker, {
       start: workerVirtualTaskStartTimestamp,
-      end: workerVirtualTaskEndTimestamp
+      end:
+        workerVirtualTaskStartTimestamp +
+        (this.pool.getWorkerTasksUsage(worker)?.avgRunTime ?? 0)
     })
   }
 }