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=81cadde164c9d4371179546fe6fff1a275bba5a7;hpb=776e97a2d35ba2003ddeddecc826353b569a4344;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 81cadde1..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,19 +1,15 @@ -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' +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, TaskStatisticsRequirements, - WorkerChoiceStrategyOptions -} from './selection-strategies-types' + 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. @@ -30,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: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + opts?: WorkerChoiceStrategyOptions ) { super(pool, opts) this.setTaskStatisticsRequirements(this.opts) @@ -75,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 },