X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=2d33738731c661e0df84a74a0ffa043e9e3b4e69;hb=b529c323958350e8b54ccfb4096d0c661c975b71;hp=011e00db2060b08dffa193b28be907b35b2eb64c;hpb=97a2abc3c559695c4fae99c48d1a2dc636275ccb;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 011e00db..2d337387 100644
--- a/src/pools/selection-strategies/worker-choice-strategy-context.ts
+++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts
@@ -1,14 +1,16 @@
 import type { IPoolInternal } from '../pool-internal'
-import { PoolType } from '../pool-internal'
 import type { IPoolWorker } from '../pool-worker'
-import { DynamicPoolWorkerChoiceStrategy } from './dynamic-pool-worker-choice-strategy'
+import { FairShareWorkerChoiceStrategy } from './fair-share-worker-choice-strategy'
+import { LessBusyWorkerChoiceStrategy } from './less-busy-worker-choice-strategy'
+import { LessUsedWorkerChoiceStrategy } from './less-used-worker-choice-strategy'
+import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
   RequiredStatistics,
   WorkerChoiceStrategy
 } from './selection-strategies-types'
 import { WorkerChoiceStrategies } from './selection-strategies-types'
-import { getWorkerChoiceStrategy } from './selection-strategies-utils'
+import { WeightedRoundRobinWorkerChoiceStrategy } from './weighted-round-robin-worker-choice-strategy'
 
 /**
  * The worker choice strategy context.
@@ -19,10 +21,13 @@ import { getWorkerChoiceStrategy } from './selection-strategies-utils'
  */
 export class WorkerChoiceStrategyContext<
   Worker extends IPoolWorker,
-  Data,
-  Response
+  Data = unknown,
+  Response = unknown
 > {
-  private workerChoiceStrategy!: IWorkerChoiceStrategy
+  private readonly workerChoiceStrategies: Map<
+  WorkerChoiceStrategy,
+  IWorkerChoiceStrategy<Worker, Data, Response>
+  >
 
   /**
    * Worker choice strategy context constructor.
@@ -32,49 +37,49 @@ export class WorkerChoiceStrategyContext<
    * @param workerChoiceStrategy - The worker choice strategy.
    */
   public constructor (
-    private readonly pool: IPoolInternal<Worker, Data, Response>,
+    pool: IPoolInternal<Worker, Data, Response>,
     private readonly createWorkerCallback: () => number,
-    workerChoiceStrategy: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
+    private workerChoiceStrategyType: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
   ) {
-    this.setWorkerChoiceStrategy(workerChoiceStrategy)
+    this.execute.bind(this)
+    this.workerChoiceStrategies = new Map<
+    WorkerChoiceStrategy,
+    IWorkerChoiceStrategy<Worker, Data, Response>
+    >([
+      [
+        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)
+      ]
+    ])
   }
 
   /**
-   * Gets the worker choice strategy instance specific to the pool type.
-   *
-   * @param workerChoiceStrategy - The worker choice strategy.
-   * @returns The worker choice strategy instance for the pool type.
-   */
-  private getPoolWorkerChoiceStrategy (
-    workerChoiceStrategy: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
-  ): IWorkerChoiceStrategy {
-    if (this.pool.type === PoolType.DYNAMIC) {
-      return new DynamicPoolWorkerChoiceStrategy(
-        this.pool,
-        this.createWorkerCallback,
-        workerChoiceStrategy
-      )
-    }
-    return getWorkerChoiceStrategy(this.pool, workerChoiceStrategy)
-  }
-
-  /**
-   * Gets the worker choice strategy used in the context.
-   *
-   * @returns The worker choice strategy.
-   * @deprecated Scheduled removal.
-   */
-  public getWorkerChoiceStrategy (): IWorkerChoiceStrategy {
-    return this.workerChoiceStrategy
-  }
-
-  /**
-   * Gets the worker choice strategy required statistics.
+   * Gets the worker choice strategy in the context required statistics.
    *
    * @returns The required statistics.
    */
   public getRequiredStatistics (): RequiredStatistics {
-    return this.workerChoiceStrategy.requiredStatistics
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+    ).requiredStatistics
   }
 
   /**
@@ -83,29 +88,46 @@ export class WorkerChoiceStrategyContext<
    * @param workerChoiceStrategy - The worker choice strategy to set.
    */
   public setWorkerChoiceStrategy (
+    pool: IPoolInternal<Worker, Data, Response>,
     workerChoiceStrategy: WorkerChoiceStrategy
   ): void {
-    this.workerChoiceStrategy?.reset()
-    this.workerChoiceStrategy =
-      this.getPoolWorkerChoiceStrategy(workerChoiceStrategy)
+    if (this.workerChoiceStrategyType === workerChoiceStrategy) {
+      this.workerChoiceStrategies.get(workerChoiceStrategy)?.reset()
+    } else {
+      this.workerChoiceStrategyType = workerChoiceStrategy
+    }
   }
 
   /**
-   * Chooses a worker with the underlying selection strategy.
+   * Executes the worker choice strategy algorithm in the context.
    *
    * @returns The key of the chosen one.
    */
   public execute (): number {
-    return this.workerChoiceStrategy.choose()
+    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()
   }
 
   /**
-   * Removes a worker in the underlying selection strategy internals.
+   * Removes a worker from the worker choice strategy in the context.
    *
    * @param workerKey - The key of the worker to remove.
    * @returns `true` if the removal is successful, `false` otherwise.
    */
   public remove (workerKey: number): boolean {
-    return this.workerChoiceStrategy.remove(workerKey)
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+    ).remove(workerKey)
   }
 }