X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=33199368c67b176a23920f407973aaf290e3a9be;hb=8b7aa4204c27efd1dc699f7baea65b5262bd26b3;hp=d800c3839af8c2675a4b7947872a72f0de385d08;hpb=d35e571704515a8b729d3455e4784054f07c368f;p=poolifier.git diff --git a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts index d800c383..33199368 100644 --- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts @@ -1,16 +1,15 @@ -import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils.js' import type { IPool } from '../pool.js' +import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js' import type { IWorker } from '../worker.js' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, - InternalWorkerChoiceStrategyOptions, - TaskStatisticsRequirements + TaskStatisticsRequirements, + WorkerChoiceStrategyOptions, } from './selection-strategies-types.js' /** * Selects the least busy worker. - * * @typeParam Worker - Type of worker which manages the strategy. * @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. @@ -27,20 +26,20 @@ export class LeastBusyWorkerChoiceStrategy< runTime: { aggregate: true, average: false, - median: false + median: false, }, waitTime: { aggregate: true, average: false, - median: false + median: false, }, - elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS + elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, } /** @inheritDoc */ public constructor ( pool: IPool, - opts: InternalWorkerChoiceStrategyOptions + opts?: WorkerChoiceStrategyOptions ) { super(pool, opts) this.setTaskStatisticsRequirements(this.opts) @@ -72,10 +71,10 @@ export class LeastBusyWorkerChoiceStrategy< return this.pool.workerNodes.reduce( (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => { return this.isWorkerNodeReady(workerNodeKey) && - (workerNode.usage.runTime.aggregate ?? 0) + - (workerNode.usage.waitTime.aggregate ?? 0) < - (workerNodes[minWorkerNodeKey].usage.runTime.aggregate ?? 0) + - (workerNodes[minWorkerNodeKey].usage.waitTime.aggregate ?? 0) + (workerNode.usage.waitTime.aggregate ?? 0) + + (workerNode.usage.runTime.aggregate ?? 0) < + (workerNodes[minWorkerNodeKey].usage.waitTime.aggregate ?? 0) + + (workerNodes[minWorkerNodeKey].usage.runTime.aggregate ?? 0) ? workerNodeKey : minWorkerNodeKey },