X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=1fe68ffae7a92b2397b22050bf12266143168540;hb=02b9f29b9b6fafd5e811dfbce4a7e0d65caf5123;hp=2fd43d7ae416181c67d83492e5d14709a1cae940;hpb=78cea37e264d5ca527bc42eb056f3b9579a2b2c4;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 2fd43d7a..1fe68ffa 100644
--- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@ -1,6 +1,9 @@
 import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
-import type { RequiredStatistics } from './selection-strategies-types'
+import type {
+  IWorkerChoiceStrategy,
+  RequiredStatistics
+} from './selection-strategies-types'
 
 /**
  * Worker virtual task timestamp.
@@ -14,67 +17,81 @@ interface 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 */
+    Worker extends IPoolWorker,
+    Data,
+    Response
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy<Worker, Data, Response> {
+  /** {@inheritDoc} */
   public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true
+    runTime: true,
+    avgRunTime: true
   }
 
   /**
    *  Worker last virtual task execution timestamp.
    */
   private readonly workerLastVirtualTaskTimestamp: Map<
-  Worker,
+  number,
   WorkerVirtualTaskTimestamp
-  > = new Map<Worker, WorkerVirtualTaskTimestamp>()
+  > = new Map<number, WorkerVirtualTaskTimestamp>()
 
-  /** @inheritDoc */
+  /** {@inheritDoc} */
   public reset (): boolean {
     this.workerLastVirtualTaskTimestamp.clear()
     return true
   }
 
-  /** @inheritDoc */
-  public choose (): Worker {
+  /** {@inheritDoc} */
+  public choose (): number {
     let minWorkerVirtualTaskEndTimestamp = Infinity
-    let chosenWorker!: Worker
-    for (const worker of this.pool.workers) {
-      this.computeWorkerLastVirtualTaskTimestamp(worker)
+    let chosenWorkerKey!: number
+    for (const [index] of this.pool.workers.entries()) {
+      this.computeWorkerLastVirtualTaskTimestamp(index)
       const workerLastVirtualTaskEndTimestamp =
-        this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? 0
+        this.workerLastVirtualTaskTimestamp.get(index)?.end ?? 0
       if (
         workerLastVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp
       ) {
         minWorkerVirtualTaskEndTimestamp = workerLastVirtualTaskEndTimestamp
-        chosenWorker = worker
+        chosenWorkerKey = index
       }
     }
-    return chosenWorker
+    return chosenWorkerKey
+  }
+
+  /** {@inheritDoc} */
+  public remove (workerKey: number): boolean {
+    const workerDeleted = this.workerLastVirtualTaskTimestamp.delete(workerKey)
+    for (const [key, value] of this.workerLastVirtualTaskTimestamp.entries()) {
+      if (key > workerKey) {
+        this.workerLastVirtualTaskTimestamp.set(key - 1, value)
+      }
+    }
+    return workerDeleted
   }
 
   /**
    * Computes worker last virtual task timestamp.
    *
-   * @param worker The worker.
+   * @param workerKey - The worker key.
    */
-  private computeWorkerLastVirtualTaskTimestamp (worker: Worker): void {
+  private computeWorkerLastVirtualTaskTimestamp (workerKey: number): void {
     const workerVirtualTaskStartTimestamp = Math.max(
       Date.now(),
-      this.workerLastVirtualTaskTimestamp.get(worker)?.end ?? -Infinity
+      this.workerLastVirtualTaskTimestamp.get(workerKey)?.end ?? -Infinity
     )
-    this.workerLastVirtualTaskTimestamp.set(worker, {
+    this.workerLastVirtualTaskTimestamp.set(workerKey, {
       start: workerVirtualTaskStartTimestamp,
       end:
         workerVirtualTaskStartTimestamp +
-        (this.pool.getWorkerAverageTasksRunTime(worker) ?? 0)
+        (this.pool.workers[workerKey].tasksUsage.avgRunTime ?? 0)
     })
   }
 }