X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fless-used-worker-choice-strategy.ts;h=01332caf7f41cf086596c325173ac639f7b7cb39;hb=6e7ad9cbdef0036358ad94bce2cdd19a307d158e;hp=9cae4a54ae336204e4ab00f29b7789c280101682;hpb=97a2abc3c559695c4fae99c48d1a2dc636275ccb;p=poolifier.git diff --git a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts index 9cae4a54..01332caf 100644 --- a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts @@ -1,5 +1,6 @@ import type { IPoolWorker } from '../pool-worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' +import type { IWorkerChoiceStrategy } from './selection-strategies-types' /** * Selects the less used worker. @@ -9,10 +10,12 @@ import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' * @typeParam Response - Type of response of execution. This can only be serializable data. */ export class LessUsedWorkerChoiceStrategy< - Worker extends IPoolWorker, - Data, - Response -> extends AbstractWorkerChoiceStrategy { + Worker extends IPoolWorker, + Data = unknown, + Response = unknown + > + extends AbstractWorkerChoiceStrategy + implements IWorkerChoiceStrategy { /** {@inheritDoc} */ public reset (): boolean { return true @@ -20,12 +23,16 @@ export class LessUsedWorkerChoiceStrategy< /** {@inheritDoc} */ public choose (): number { + const freeWorkerKey = this.pool.findFreeWorkerKey() + if (freeWorkerKey !== -1) { + return freeWorkerKey + } let minNumberOfTasks = Infinity let lessUsedWorkerKey!: number for (const [index, workerItem] of this.pool.workers.entries()) { const tasksUsage = workerItem.tasksUsage const workerTasks = tasksUsage?.run + tasksUsage?.running - if (!this.isDynamicPool && workerTasks === 0) { + if (workerTasks === 0) { return index } else if (workerTasks < minNumberOfTasks) { minNumberOfTasks = workerTasks