X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=cbe00a4780792fdcf189d217b29ddcbe2787c853;hb=bb8907c8d1a6fc3f2d03c3d47406cdde29693fea;hp=35ab69d0ca38595c2f81be566a0b7352bf900e4e;hpb=5df69fabd77b3ec4137a6382e2d84791bf0fe85d;p=poolifier.git diff --git a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts index 35ab69d0..cbe00a47 100644 --- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts @@ -1,4 +1,7 @@ -import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' +import { + DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS +} from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' @@ -12,8 +15,8 @@ import type { * Selects the worker with the least ELU. * * @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 execution response. This can only be serializable data. + * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data. + * @typeParam Response - Type of execution response. This can only be structured-cloneable data. */ export class LeastEluWorkerChoiceStrategy< Worker extends IWorker, @@ -24,16 +27,8 @@ export class LeastEluWorkerChoiceStrategy< implements IWorkerChoiceStrategy { /** @inheritDoc */ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = { - runTime: { - aggregate: false, - average: false, - median: false - }, - waitTime: { - aggregate: false, - average: false, - median: false - }, + runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, elu: { aggregate: true, average: false, @@ -63,18 +58,18 @@ export class LeastEluWorkerChoiceStrategy< /** @inheritDoc */ public choose (): number { let minWorkerElu = Infinity - let leastEluWorkerNodeKey!: number for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { - const workerUsage = workerNode.workerUsage + const workerUsage = workerNode.usage const workerElu = workerUsage.elu?.active.aggregate ?? 0 if (workerElu === 0) { - return workerNodeKey + this.nextWorkerNodeId = workerNodeKey + break } else if (workerElu < minWorkerElu) { minWorkerElu = workerElu - leastEluWorkerNodeKey = workerNodeKey + this.nextWorkerNodeId = workerNodeKey } } - return leastEluWorkerNodeKey + return this.nextWorkerNodeId } /** @inheritDoc */