X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=3d32dad68eee8b700a6aed3b2a4811876d978427;hb=a788de39a01b042deb0707c2e92af99181b933d2;hp=5d26f82ba4f5784873c18eb037beed9b26a5e2f5;hpb=c20870b2b767a578f59fa7c9f89a7a41384b557d;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 5d26f82b..3d32dad6 100644 --- a/src/pools/selection-strategies/worker-choice-strategy-context.ts +++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts @@ -2,12 +2,13 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' 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 { InterleavedWeightedRoundRobinWorkerChoiceStrategy } from './interleaved-weighted-round-robin-worker-choice-strategy' +import { LeastBusyWorkerChoiceStrategy } from './least-busy-worker-choice-strategy' +import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy' import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy' import type { IWorkerChoiceStrategy, - RequiredStatistics, + TaskStatistics, WorkerChoiceStrategy, WorkerChoiceStrategyOptions } from './selection-strategies-types' @@ -56,15 +57,15 @@ export class WorkerChoiceStrategyContext< ) ], [ - WorkerChoiceStrategies.LESS_USED, - new (LessUsedWorkerChoiceStrategy.bind(this))( + WorkerChoiceStrategies.LEAST_USED, + new (LeastUsedWorkerChoiceStrategy.bind(this))( pool, opts ) ], [ - WorkerChoiceStrategies.LESS_BUSY, - new (LessBusyWorkerChoiceStrategy.bind(this))( + WorkerChoiceStrategies.LEAST_BUSY, + new (LeastBusyWorkerChoiceStrategy.bind(this))( pool, opts ) @@ -83,21 +84,29 @@ export class WorkerChoiceStrategyContext< Data, Response >(pool, opts) + ], + [ + WorkerChoiceStrategies.INTERLEAVED_WEIGHTED_ROUND_ROBIN, + new (InterleavedWeightedRoundRobinWorkerChoiceStrategy.bind(this))< + Worker, + Data, + Response + >(pool, opts) ] ]) } /** - * Gets the worker choice strategy in the context required statistics. + * Gets the worker choice strategy task statistics in the context. * - * @returns The required statistics. + * @returns The task statistics. */ - public getRequiredStatistics (): RequiredStatistics { + public getTaskStatistics (): TaskStatistics { return ( this.workerChoiceStrategies.get( this.workerChoiceStrategy ) as IWorkerChoiceStrategy - ).requiredStatistics + ).taskStatistics } /** @@ -165,8 +174,8 @@ export class WorkerChoiceStrategyContext< * @param opts - The worker choice strategy options. */ public setOptions (opts: WorkerChoiceStrategyOptions): void { - this.workerChoiceStrategies.forEach(workerChoiceStrategy => { + for (const workerChoiceStrategy of this.workerChoiceStrategies.values()) { workerChoiceStrategy.setOptions(opts) - }) + } } }