X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fround-robin-worker-choice-strategy.ts;h=9b49d7643581d8a4991bc1b25239b2053e0265d2;hb=6e7ad9cbdef0036358ad94bce2cdd19a307d158e;hp=76cdd4abac3ff7a2c5a5988cf76e66d87ab9be9b;hpb=38e795c12f0e9daeff7b025147f36f85f486366e;p=poolifier.git diff --git a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts index 76cdd4ab..9b49d764 100644 --- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/round-robin-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 next worker in a round robin fashion. @@ -9,28 +10,41 @@ import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' * @typeParam Response - Type of response of execution. This can only be serializable data. */ export class RoundRobinWorkerChoiceStrategy< - Worker extends IPoolWorker, - Data, - Response -> extends AbstractWorkerChoiceStrategy { + Worker extends IPoolWorker, + Data = unknown, + Response = unknown + > + extends AbstractWorkerChoiceStrategy + implements IWorkerChoiceStrategy { /** - * Index for the next worker. + * Id of the next worker. */ - private nextWorkerIndex: number = 0 + private nextWorkerId: number = 0 /** {@inheritDoc} */ public reset (): boolean { - this.nextWorkerIndex = 0 + this.nextWorkerId = 0 return true } /** {@inheritDoc} */ - public choose (): Worker { - const chosenWorker = this.pool.workers[this.nextWorkerIndex] - this.nextWorkerIndex = - this.nextWorkerIndex === this.pool.workers.length - 1 + public choose (): number { + const chosenWorkerKey = this.nextWorkerId + this.nextWorkerId = + this.nextWorkerId === this.pool.workers.length - 1 ? 0 - : this.nextWorkerIndex + 1 - return chosenWorker + : this.nextWorkerId + 1 + return chosenWorkerKey + } + + /** {@inheritDoc} */ + public remove (workerKey: number): boolean { + if (this.nextWorkerId === workerKey) { + this.nextWorkerId = + this.nextWorkerId > this.pool.workers.length - 1 + ? this.pool.workers.length - 1 + : this.nextWorkerId + } + return true } }