X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=48198371b54a7d2f8807dcfdd10e53cdc10a579f;hb=e65c6cd9a3d6ed2e5b8af95120a5aa070101e945;hp=0d4773ff82f7ee91ce77114da582c59d15f7a201;hpb=ea2ee1f4fe0312a092b9aa88538aaecf423c908f;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 0d4773ff..48198371 100644
--- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@ -1,11 +1,11 @@
-import type { AbstractPoolWorker } from '../abstract-pool-worker'
+import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type { RequiredStatistics } from './selection-strategies-types'
 
 /**
  * Worker virtual task timestamp.
  */
-type WorkerVirtualTaskTimestamp = {
+interface WorkerVirtualTaskTimestamp {
   start: number
   end: number
 }
@@ -14,34 +14,41 @@ 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 AbstractPoolWorker,
+  Worker extends IPoolWorker,
   Data,
   Response
 > extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** @inheritDoc */
-  public requiredStatistics: RequiredStatistics = {
+  /** {@inheritDoc} */
+  public readonly requiredStatistics: RequiredStatistics = {
     runTime: true
   }
 
   /**
    *  Worker last virtual task execution timestamp.
    */
-  private workerLastVirtualTaskTimestamp: Map<
-    Worker,
-    WorkerVirtualTaskTimestamp
+  private readonly workerLastVirtualTaskTimestamp: Map<
+  Worker,
+  WorkerVirtualTaskTimestamp
   > = new Map<Worker, WorkerVirtualTaskTimestamp>()
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
+  public reset (): boolean {
+    this.workerLastVirtualTaskTimestamp.clear()
+    return true
+  }
+
+  /** {@inheritDoc} */
   public choose (): Worker {
-    this.updateWorkerLastVirtualTaskTimestamp()
     let minWorkerVirtualTaskEndTimestamp = Infinity
     let chosenWorker!: Worker
-    for (const worker of this.pool.workers) {
+    for (const workerItem of this.pool.workers) {
+      const worker = workerItem.worker
+      this.computeWorkerLastVirtualTaskTimestamp(worker)
       const workerLastVirtualTaskEndTimestamp =
         this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? 0
       if (
@@ -55,21 +62,20 @@ export class FairShareWorkerChoiceStrategy<
   }
 
   /**
-   * Compute workers last virtual task timestamp.
+   * Computes worker last virtual task timestamp.
+   *
+   * @param worker - The worker.
    */
-  private updateWorkerLastVirtualTaskTimestamp () {
-    for (const worker of this.pool.workers) {
-      const workerVirtualTaskStartTimestamp = Math.max(
-        Date.now(),
-        this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? -Infinity
-      )
-      const workerVirtualTaskEndTimestamp =
+  private computeWorkerLastVirtualTaskTimestamp (worker: Worker): void {
+    const workerVirtualTaskStartTimestamp = Math.max(
+      Date.now(),
+      this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? -Infinity
+    )
+    this.workerLastVirtualTaskTimestamp.set(worker, {
+      start: workerVirtualTaskStartTimestamp,
+      end:
         workerVirtualTaskStartTimestamp +
-        (this.pool.getWorkerAverageTasksRunTime(worker) ?? 0)
-      this.workerLastVirtualTaskTimestamp.set(worker, {
-        start: workerVirtualTaskStartTimestamp,
-        end: workerVirtualTaskEndTimestamp
-      })
-    }
+        (this.pool.getWorkerTasksUsage(worker)?.avgRunTime ?? 0)
+    })
   }
 }