X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=efa9578d8b2f889630aadec6da595ded93cd087f;hb=ace229a1b5029d3acaeeb4e8abdab415de5318f1;hp=c3fb28c4f1e162185f65e08029c886e8df826d99;hpb=49be33feded000ed776ee589274e154fa519b263;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 c3fb28c4..efa9578d 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -27,7 +27,10 @@ export abstract class AbstractWorkerChoiceStrategy< public readonly requiredStatistics: RequiredStatistics = { runTime: false, avgRunTime: false, - medRunTime: false + medRunTime: false, + waitTime: false, + avgWaitTime: false, + medWaitTime: false } /** @@ -52,6 +55,14 @@ export abstract class AbstractWorkerChoiceStrategy< this.requiredStatistics.avgRunTime = true this.requiredStatistics.medRunTime = opts.medRunTime as boolean } + if (this.requiredStatistics.avgWaitTime && opts.medWaitTime === true) { + this.requiredStatistics.avgWaitTime = false + this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + } + if (this.requiredStatistics.medWaitTime && opts.medWaitTime === false) { + this.requiredStatistics.avgWaitTime = true + this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + } } /** @inheritDoc */ @@ -87,6 +98,20 @@ export abstract class AbstractWorkerChoiceStrategy< return this.findFirstFreeWorkerNodeKey() } + /** + * Gets the worker task runtime. + * If the required statistics are `avgRunTime`, the average runtime is returned. + * If the required statistics are `medRunTime`, the median runtime is returned. + * + * @param workerNodeKey - The worker node key. + * @returns The worker task runtime. + */ + protected getWorkerTaskRunTime (workerNodeKey: number): number { + return this.requiredStatistics.medRunTime + ? this.pool.workerNodes[workerNodeKey].tasksUsage.medRunTime + : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime + } + /** * Finds the first free worker node key based on the number of tasks the worker has applied. *