X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=192cf005805ecfd70c70a337c9a7ac078ce46abb;hb=78099a150dc54d7adab495195fa5f133fd54e114;hp=90c98c6018a1c786fda04234fd48eb5557b0edec;hpb=95c83464bb1fab234d1c41204f98defcd01c789f;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 90c98c60..192cf005 100644
--- a/src/pools/selection-strategies/worker-choice-strategy-context.ts
+++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts
@@ -24,25 +24,47 @@ export class WorkerChoiceStrategyContext<
   Data = unknown,
   Response = unknown
 > {
-  private readonly workerChoiceStrategies = new Map<
+  private readonly workerChoiceStrategies: Map<
   WorkerChoiceStrategy,
-  IWorkerChoiceStrategy<Worker, Data, Response>
-  >()
+  IWorkerChoiceStrategy
+  >
 
   /**
    * Worker choice strategy context constructor.
    *
    * @param pool - The pool instance.
-   * @param createWorkerCallback - The worker creation callback for dynamic pool.
-   * @param workerChoiceStrategy - The worker choice strategy.
+   * @param workerChoiceStrategyType - The worker choice strategy.
    */
   public constructor (
     pool: IPoolInternal<Worker, Data, Response>,
-    private readonly createWorkerCallback: () => number,
     private workerChoiceStrategyType: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
   ) {
     this.execute.bind(this)
-    this.registerWorkerChoiceStrategy(pool, 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)
+      ]
+    ])
   }
 
   /**
@@ -54,7 +76,7 @@ export class WorkerChoiceStrategyContext<
     return (
       this.workerChoiceStrategies.get(
         this.workerChoiceStrategyType
-      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+      ) as IWorkerChoiceStrategy
     ).requiredStatistics
   }
 
@@ -64,15 +86,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.workerChoiceStrategies.get(workerChoiceStrategy)?.reset()
-    } else {
+    if (this.workerChoiceStrategyType !== workerChoiceStrategy) {
       this.workerChoiceStrategyType = workerChoiceStrategy
-      this.registerWorkerChoiceStrategy(pool, workerChoiceStrategy)
     }
+    this.workerChoiceStrategies.get(this.workerChoiceStrategyType)?.reset()
   }
 
   /**
@@ -81,17 +100,11 @@ export class WorkerChoiceStrategyContext<
    * @returns The key of the chosen one.
    */
   public execute (): number {
-    const workerChoiceStrategy = this.workerChoiceStrategies.get(
-      this.workerChoiceStrategyType
-    ) as IWorkerChoiceStrategy<Worker, Data, Response>
-    if (
-      workerChoiceStrategy.isDynamicPool &&
-      !workerChoiceStrategy.pool.full &&
-      workerChoiceStrategy.pool.findFreeWorkerKey() === -1
-    ) {
-      return this.createWorkerCallback()
-    }
-    return workerChoiceStrategy.choose()
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy
+    ).choose()
   }
 
   /**
@@ -104,53 +117,7 @@ export class WorkerChoiceStrategyContext<
     return (
       this.workerChoiceStrategies.get(
         this.workerChoiceStrategyType
-      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+      ) as IWorkerChoiceStrategy
     ).remove(workerKey)
   }
-
-  private registerWorkerChoiceStrategy (
-    pool: IPoolInternal<Worker, Data, Response>,
-    workerChoiceStrategy: WorkerChoiceStrategy
-  ): void {
-    if (!this.workerChoiceStrategies.has(workerChoiceStrategy)) {
-      this.workerChoiceStrategies.set(
-        workerChoiceStrategy,
-        this.getWorkerChoiceStrategy(pool, workerChoiceStrategy)
-      )
-    }
-  }
-
-  /**
-   * 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`
-        )
-    }
-  }
 }