X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=d9a573417ec2f96c0cbf68bc88a6931aeb68de29;hb=930dcf12982091cb5658b5a44acd47676fbae631;hp=18b47a1d9d38bcbb1ac4361dd4938d0106d47fe7;hpb=932fc8be063cc15b543ad14c2ab6df0fa4224fba;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 18b47a1d..d9a57341 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -36,7 +36,11 @@ export abstract class AbstractWorkerChoiceStrategy< average: false, median: false }, - elu: false + elu: { + aggregate: false, + average: false, + median: false + } } /** @@ -87,6 +91,20 @@ export abstract class AbstractWorkerChoiceStrategy< this.taskStatisticsRequirements.waitTime.median = opts.waitTime .median as boolean } + if ( + this.taskStatisticsRequirements.elu.average && + opts.elu?.median === true + ) { + this.taskStatisticsRequirements.elu.average = false + this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean + } + if ( + this.taskStatisticsRequirements.elu.median && + opts.elu?.median === false + ) { + this.taskStatisticsRequirements.elu.average = true + this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean + } } /** @inheritDoc */ @@ -144,12 +162,26 @@ export abstract class AbstractWorkerChoiceStrategy< * @param workerNodeKey - The worker node key. * @returns The worker task wait time. */ - protected getWorkerWaitTime (workerNodeKey: number): number { + protected getWorkerTaskWaitTime (workerNodeKey: number): number { return this.taskStatisticsRequirements.waitTime.median ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average } + /** + * Gets the worker task ELU. + * If the task statistics require the average ELU, the average ELU is returned. + * If the task statistics require the median ELU, the median ELU is returned. + * + * @param workerNodeKey - The worker node key. + * @returns The worker task ELU. + */ + protected getWorkerTaskElu (workerNodeKey: number): number { + return this.taskStatisticsRequirements.elu.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.median + : this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.average + } + protected computeDefaultWorkerWeight (): number { let cpusCycleTimeWeight = 0 for (const cpu of cpus()) {