X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=826a89d9d6ce19c3f362f918785653c3056ba42e;hb=aee467366d8c393b79e7af82c6a7ab12338ee64e;hp=644adfea1f3e9a10dd156a03db31983402438185;hpb=51fe3d3cb0858b5e2ad96076b51a6b9daa8f852c;p=poolifier.git

diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts
index 644adfea..826a89d9 100644
--- a/src/pools/selection-strategies/worker-choice-strategy-context.ts
+++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts
@@ -24,7 +24,10 @@ export class WorkerChoiceStrategyContext<
   Data = unknown,
   Response = unknown
 > {
-  private workerChoiceStrategy: IWorkerChoiceStrategy<Worker, Data, Response>
+  private readonly workerChoiceStrategies: Map<
+  WorkerChoiceStrategy,
+  IWorkerChoiceStrategy
+  >
 
   /**
    * Worker choice strategy context constructor.
@@ -35,14 +38,34 @@ export class WorkerChoiceStrategyContext<
    */
   public constructor (
     pool: IPoolInternal<Worker, Data, Response>,
-    private readonly createWorkerCallback: () => number,
     private workerChoiceStrategyType: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
   ) {
     this.execute.bind(this)
-    this.workerChoiceStrategy = this.getWorkerChoiceStrategy(
-      pool,
-      this.workerChoiceStrategyType
-    )
+    this.workerChoiceStrategies = new Map<
+    WorkerChoiceStrategy,
+    IWorkerChoiceStrategy
+    >([
+      [
+        WorkerChoiceStrategies.ROUND_ROBIN,
+        new RoundRobinWorkerChoiceStrategy<Worker, Data, Response>(pool)
+      ],
+      [
+        WorkerChoiceStrategies.LESS_USED,
+        new LessUsedWorkerChoiceStrategy<Worker, Data, Response>(pool)
+      ],
+      [
+        WorkerChoiceStrategies.LESS_BUSY,
+        new LessBusyWorkerChoiceStrategy<Worker, Data, Response>(pool)
+      ],
+      [
+        WorkerChoiceStrategies.FAIR_SHARE,
+        new FairShareWorkerChoiceStrategy<Worker, Data, Response>(pool)
+      ],
+      [
+        WorkerChoiceStrategies.WEIGHTED_ROUND_ROBIN,
+        new WeightedRoundRobinWorkerChoiceStrategy<Worker, Data, Response>(pool)
+      ]
+    ])
   }
 
   /**
@@ -51,7 +74,11 @@ export class WorkerChoiceStrategyContext<
    * @returns The required statistics.
    */
   public getRequiredStatistics (): RequiredStatistics {
-    return this.workerChoiceStrategy.requiredStatistics
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy
+    ).requiredStatistics
   }
 
   /**
@@ -60,18 +87,12 @@ export class WorkerChoiceStrategyContext<
    * @param workerChoiceStrategy - The worker choice strategy to set.
    */
   public setWorkerChoiceStrategy (
-    pool: IPoolInternal<Worker, Data, Response>,
     workerChoiceStrategy: WorkerChoiceStrategy
   ): void {
-    if (this.workerChoiceStrategyType === workerChoiceStrategy) {
-      this.workerChoiceStrategy?.reset()
-    } else {
+    if (this.workerChoiceStrategyType !== workerChoiceStrategy) {
       this.workerChoiceStrategyType = workerChoiceStrategy
-      this.workerChoiceStrategy = this.getWorkerChoiceStrategy(
-        pool,
-        this.workerChoiceStrategyType
-      )
     }
+    this.workerChoiceStrategies.get(this.workerChoiceStrategyType)?.reset()
   }
 
   /**
@@ -80,14 +101,11 @@ export class WorkerChoiceStrategyContext<
    * @returns The key of the chosen one.
    */
   public execute (): number {
-    if (
-      this.workerChoiceStrategy.isDynamicPool &&
-      !this.workerChoiceStrategy.pool.full &&
-      this.workerChoiceStrategy.pool.findFreeWorkerKey() === -1
-    ) {
-      return this.createWorkerCallback()
-    }
-    return this.workerChoiceStrategy.choose()
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy
+    ).choose()
   }
 
   /**
@@ -97,40 +115,10 @@ export class WorkerChoiceStrategyContext<
    * @returns `true` if the removal is successful, `false` otherwise.
    */
   public remove (workerKey: number): boolean {
-    return this.workerChoiceStrategy.remove(workerKey)
-  }
-
-  /**
-   * Gets the worker choice strategy instance.
-   *
-   * @param pool - The pool instance.
-   * @param workerChoiceStrategy - The worker choice strategy.
-   * @returns The worker choice strategy instance.
-   */
-  private getWorkerChoiceStrategy (
-    pool: IPoolInternal<Worker, Data, Response>,
-    workerChoiceStrategy: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
-  ): IWorkerChoiceStrategy<Worker, Data, Response> {
-    switch (workerChoiceStrategy) {
-      case WorkerChoiceStrategies.ROUND_ROBIN:
-        return new RoundRobinWorkerChoiceStrategy<Worker, Data, Response>(pool)
-      case WorkerChoiceStrategies.LESS_USED:
-        return new LessUsedWorkerChoiceStrategy<Worker, Data, Response>(pool)
-      case WorkerChoiceStrategies.LESS_BUSY:
-        return new LessBusyWorkerChoiceStrategy<Worker, Data, Response>(pool)
-      case WorkerChoiceStrategies.FAIR_SHARE:
-        return new FairShareWorkerChoiceStrategy<Worker, Data, Response>(pool)
-      case WorkerChoiceStrategies.WEIGHTED_ROUND_ROBIN:
-        return new WeightedRoundRobinWorkerChoiceStrategy<
-        Worker,
-        Data,
-        Response
-        >(pool)
-      default:
-        throw new Error(
-          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-          `Worker choice strategy '${workerChoiceStrategy}' not found`
-        )
-    }
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy
+    ).remove(workerKey)
   }
 }