X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fless-used-worker-choice-strategy.ts;h=dffed99e8f6ece8658fd6b22688598e1374ece6b;hb=53cf34054602ef192d39c45ef257eddc0ae0fa97;hp=f653160bdb29ece08cd5f1265012739da3443044;hpb=cf9c7b65548f4d3a4e95e87731ae1c40766d48fb;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 f653160b..dffed99e 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,11 +23,15 @@ 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 + const workerTasks = tasksUsage.run + tasksUsage.running if (workerTasks === 0) { return index } else if (workerTasks < minNumberOfTasks) {