X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=ea598b207f2e1b20358ce0cd6c5da134077ae8f1;hb=17393ac83cbf0eacf68ea9efb0a577cc30a5c685;hp=fc9b069522c8366226836a28bac08518dc23b969;hpb=5a94e4b950eaf2234e07f87261ddea1482e839c6;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 fc9b0695..ea598b20 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,8 +1,11 @@
-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'
-import type { RequiredStatistics } from './selection-strategies-types'
+import type {
+  IWorkerChoiceStrategy,
+  RequiredStatistics
+} from './selection-strategies-types'
 
 /**
  * Virtual task runtime.
@@ -21,13 +24,16 @@ interface TaskRunTime {
  * @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} */
+    Worker extends IPoolWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
+  /** @inheritDoc */
   public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true
+    runTime: true,
+    avgRunTime: true
   }
 
   /**
@@ -41,8 +47,8 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   /**
    * Per worker virtual task runtime map.
    */
-  private readonly workersTaskRunTime: Map<Worker, TaskRunTime> = new Map<
-  Worker,
+  private readonly workersTaskRunTime: Map<number, TaskRunTime> = new Map<
+  number,
   TaskRunTime
   >()
 
@@ -57,7 +63,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
     this.initWorkersTaskRunTime()
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public reset (): boolean {
     this.currentWorkerId = 0
     this.workersTaskRunTime.clear()
@@ -65,62 +71,78 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
     return true
   }
 
-  /** {@inheritDoc} */
-  public choose (): Worker {
-    const chosenWorker = this.pool.workers.get(this.currentWorkerId)
-      ?.worker as Worker
-    if (this.isDynamicPool && !this.workersTaskRunTime.has(chosenWorker)) {
-      this.initWorkerTaskRunTime(chosenWorker)
+  /** @inheritDoc */
+  public choose (): number {
+    const chosenWorkerKey = this.currentWorkerId
+    if (this.isDynamicPool && !this.workersTaskRunTime.has(chosenWorkerKey)) {
+      this.initWorkerTaskRunTime(chosenWorkerKey)
     }
     const workerTaskRunTime =
-      this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0
+      this.workersTaskRunTime.get(chosenWorkerKey)?.runTime ?? 0
     const workerTaskWeight =
-      this.workersTaskRunTime.get(chosenWorker)?.weight ??
+      this.workersTaskRunTime.get(chosenWorkerKey)?.weight ??
       this.defaultWorkerWeight
     if (workerTaskRunTime < workerTaskWeight) {
       this.setWorkerTaskRunTime(
-        chosenWorker,
+        chosenWorkerKey,
         workerTaskWeight,
         workerTaskRunTime +
-          (this.getWorkerVirtualTaskRunTime(chosenWorker) ?? 0)
+          (this.getWorkerVirtualTaskRunTime(chosenWorkerKey) ?? 0)
       )
     } else {
       this.currentWorkerId =
-        this.currentWorkerId === this.pool.workers.size - 1
+        this.currentWorkerId === this.pool.workers.length - 1
           ? 0
           : this.currentWorkerId + 1
-      this.setWorkerTaskRunTime(
-        this.pool.workers.get(this.currentWorkerId)?.worker as Worker,
-        workerTaskWeight,
-        0
-      )
+      this.setWorkerTaskRunTime(this.currentWorkerId, workerTaskWeight, 0)
+    }
+    return chosenWorkerKey
+  }
+
+  /** @inheritDoc */
+  public remove (workerKey: number): boolean {
+    if (this.currentWorkerId === workerKey) {
+      if (this.pool.workers.length === 0) {
+        this.currentWorkerId = 0
+      } else {
+        this.currentWorkerId =
+          this.currentWorkerId > this.pool.workers.length - 1
+            ? this.pool.workers.length - 1
+            : this.currentWorkerId
+      }
+    }
+    const workerDeleted = this.workersTaskRunTime.delete(workerKey)
+    for (const [key, value] of this.workersTaskRunTime) {
+      if (key > workerKey) {
+        this.workersTaskRunTime.set(key - 1, value)
+      }
     }
-    return chosenWorker
+    return workerDeleted
   }
 
   private initWorkersTaskRunTime (): void {
-    for (const value of this.pool.workers.values()) {
-      this.initWorkerTaskRunTime(value.worker)
+    for (const [index] of this.pool.workers.entries()) {
+      this.initWorkerTaskRunTime(index)
     }
   }
 
-  private initWorkerTaskRunTime (worker: Worker): void {
-    this.setWorkerTaskRunTime(worker, this.defaultWorkerWeight, 0)
+  private initWorkerTaskRunTime (workerKey: number): void {
+    this.setWorkerTaskRunTime(workerKey, this.defaultWorkerWeight, 0)
   }
 
   private setWorkerTaskRunTime (
-    worker: Worker,
+    workerKey: number,
     weight: number,
     runTime: number
   ): void {
-    this.workersTaskRunTime.set(worker, {
+    this.workersTaskRunTime.set(workerKey, {
       weight,
       runTime
     })
   }
 
-  private getWorkerVirtualTaskRunTime (worker: Worker): number | undefined {
-    return this.pool.getWorkerAverageTasksRunTime(worker)
+  private getWorkerVirtualTaskRunTime (workerKey: number): number {
+    return this.pool.workers[workerKey].tasksUsage.avgRunTime
   }
 
   private computeWorkerWeight (): number {