X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fless-busy-worker-choice-strategy.ts;h=75109a2b2848af781704a0c41965cf7180ea27e7;hb=d0a3f018e1bcd5acdd56bb1b566d90b97e4f13c7;hp=2bbafb59ec5b07dfca9001f587cb4878af87dca6;hpb=c923ce5670eeae4194aa996d44a1071e88cb21ad;p=poolifier.git diff --git a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts index 2bbafb59..75109a2b 100644 --- a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts @@ -1,6 +1,9 @@ import type { IPoolWorker } from '../pool-worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' -import type { RequiredStatistics } from './selection-strategies-types' +import type { + IWorkerChoiceStrategy, + RequiredStatistics +} from './selection-strategies-types' /** * Selects the less busy worker. @@ -10,10 +13,12 @@ import type { RequiredStatistics } from './selection-strategies-types' * @typeParam Response - Type of response of execution. This can only be serializable data. */ export class LessBusyWorkerChoiceStrategy< - Worker extends IPoolWorker, - Data, - Response -> extends AbstractWorkerChoiceStrategy { + Worker extends IPoolWorker, + Data, + Response + > + extends AbstractWorkerChoiceStrategy + implements IWorkerChoiceStrategy { /** {@inheritDoc} */ public readonly requiredStatistics: RequiredStatistics = { runTime: true @@ -26,11 +31,15 @@ export class LessBusyWorkerChoiceStrategy< /** {@inheritDoc} */ public choose (): number { + const freeWorkerKey = this.pool.findFreeWorkerKey() + if (!this.isDynamicPool && freeWorkerKey !== -1) { + return freeWorkerKey + } let minRunTime = Infinity let lessBusyWorkerKey!: number for (const [index, workerItem] of this.pool.workers.entries()) { const workerRunTime = workerItem.tasksUsage.runTime - if (!this.isDynamicPool && workerRunTime === 0) { + if (workerRunTime === 0) { return index } else if (workerRunTime < minRunTime) { minRunTime = workerRunTime @@ -39,4 +48,9 @@ export class LessBusyWorkerChoiceStrategy< } return lessBusyWorkerKey } + + /** {@inheritDoc} */ + public remove (workerKey: number): boolean { + return true + } }