X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=60c22a299df6ee2825dc63a79e9c405fe72d3312;hb=2285a040e7d48457c735547e296939b0341d29fd;hp=25a013ea64d604319cfe6d11678f59c8f7435a96;hpb=bdede008ae867784cd6dfa7468a930d7c026177b;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 25a013ea..60c22a29 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,14 @@
-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'
+import type {
+  IWorkerChoiceStrategy,
+  RequiredStatistics
+} from './selection-strategies-types'
 
 /**
  * Worker virtual task timestamp.
  */
-type WorkerVirtualTaskTimestamp = {
+interface WorkerVirtualTaskTimestamp {
   start: number
   end: number
 }
@@ -14,62 +17,81 @@ 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,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** @inheritDoc */
-  public requiredStatistics: RequiredStatistics = {
-    runTime: true
+    Worker extends IPoolWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy<Worker, Data, Response> {
+  /** {@inheritDoc} */
+  public readonly requiredStatistics: RequiredStatistics = {
+    runTime: true,
+    avgRunTime: true
   }
 
   /**
    *  Worker last virtual task execution timestamp.
    */
-  private workerLastVirtualTaskTimestamp: Map<
-    Worker,
-    WorkerVirtualTaskTimestamp
-  > = new Map<Worker, WorkerVirtualTaskTimestamp>()
+  private readonly workerLastVirtualTaskTimestamp: Map<
+  number,
+  WorkerVirtualTaskTimestamp
+  > = new Map<number, WorkerVirtualTaskTimestamp>()
 
-  /** @inheritDoc */
-  public choose (): Worker {
-    this.updateWorkerLastVirtualTaskTimestamp()
+  /** {@inheritDoc} */
+  public reset (): boolean {
+    this.workerLastVirtualTaskTimestamp.clear()
+    return true
+  }
+
+  /** {@inheritDoc} */
+  public choose (): number {
     let minWorkerVirtualTaskEndTimestamp = Infinity
-    let chosenWorker!: Worker
-    for (const worker of this.pool.workers) {
+    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 workers last virtual task timestamp.
+   * Computes worker last virtual task timestamp.
+   *
+   * @param workerKey - The worker key.
    */
-  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 (workerKey: number): void {
+    const workerVirtualTaskStartTimestamp = Math.max(
+      Date.now(),
+      this.workerLastVirtualTaskTimestamp.get(workerKey)?.end ?? -Infinity
+    )
+    this.workerLastVirtualTaskTimestamp.set(workerKey, {
+      start: workerVirtualTaskStartTimestamp,
+      end:
         workerVirtualTaskStartTimestamp +
-        (this.pool.getWorkerAverageTasksRunTime(worker) ?? 0)
-      this.workerLastVirtualTaskTimestamp.set(worker, {
-        start: workerVirtualTaskStartTimestamp,
-        end: workerVirtualTaskEndTimestamp
-      })
-    }
+        (this.pool.workers[workerKey].tasksUsage.avgRunTime ?? 0)
+    })
   }
 }