X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=859ead823bc233c6e251eb004e7d6fb0563459e6;hb=a20f0ba5aa9c6946254aa197286ad9b70b6a0319;hp=d60d2905674e5b6fc5baa66616a63e9ab9f1fc85;hpb=bbeadd16bc03b9199221a7fb5732af46e7867ded;p=poolifier.git diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index d60d2905..859ead82 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,6 +1,5 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' -import type { IPoolInternal } from '../pool-internal' -import { PoolType } from '../pool-internal' +import { PoolType, type IPool } from '../pool' import type { IWorker } from '../worker' import type { IWorkerChoiceStrategy, @@ -13,7 +12,7 @@ import type { * * @typeParam Worker - Type of worker which manages the strategy. * @typeParam Data - Type of data sent to the worker. This can only be serializable data. - * @typeParam Response - Type of response of execution. This can only be serializable data. + * @typeParam Response - Type of execution response. This can only be serializable data. */ export abstract class AbstractWorkerChoiceStrategy< Worker extends IWorker, @@ -36,17 +35,21 @@ export abstract class AbstractWorkerChoiceStrategy< * @param opts - The worker choice strategy options. */ public constructor ( - protected readonly pool: IPoolInternal, - protected readonly opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + protected readonly pool: IPool, + protected opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS ) { - this.checkOptions(this.opts) this.isDynamicPool = this.pool.type === PoolType.DYNAMIC this.choose.bind(this) } - private checkOptions (opts: WorkerChoiceStrategyOptions): void { + protected checkOptions (opts: WorkerChoiceStrategyOptions): void { if (this.requiredStatistics.avgRunTime && opts.medRunTime === true) { - this.requiredStatistics.medRunTime = true + this.requiredStatistics.avgRunTime = false + this.requiredStatistics.medRunTime = opts.medRunTime as boolean + } + if (this.requiredStatistics.medRunTime && opts.medRunTime === false) { + this.requiredStatistics.avgRunTime = true + this.requiredStatistics.medRunTime = opts.medRunTime as boolean } } @@ -58,4 +61,10 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public abstract remove (workerNodeKey: number): boolean + + /** @inheritDoc */ + public setOptions (opts: WorkerChoiceStrategyOptions): void { + this.checkOptions(opts) + this.opts = opts + } }