X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fround-robin-worker-choice-strategy.ts;h=80e958a406fa2209ce1c20eded5b8e9b79e9ca0b;hb=f82cd3579677f83c17289218d4ae8242e7d0a8d7;hp=29b05fa507f0b3ca8a18a300ad1c6927d9b76a65;hpb=17393ac83cbf0eacf68ea9efb0a577cc30a5c685;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 29b05fa5..80e958a4 100644 --- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts @@ -1,4 +1,4 @@ -import type { IPoolWorker } from '../pool-worker' +import type { IWorker } from '../worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' import type { IWorkerChoiceStrategy } from './selection-strategies-types' @@ -7,46 +7,46 @@ import type { IWorkerChoiceStrategy } from './selection-strategies-types' * * @typeParam Worker - Type of worker which manages the strategy. * @typeParam Data - Type of data sent to the worker. This can only be serializable data. - * @typeParam Response - Type of response of execution. This can only be serializable data. + * @typeParam Response - Type of execution response. This can only be serializable data. */ export class RoundRobinWorkerChoiceStrategy< - Worker extends IPoolWorker, + Worker extends IWorker, Data = unknown, Response = unknown > extends AbstractWorkerChoiceStrategy implements IWorkerChoiceStrategy { /** - * Id of the next worker. + * Id of the next worker node. */ - private nextWorkerId: number = 0 + private nextWorkerNodeId: number = 0 /** @inheritDoc */ public reset (): boolean { - this.nextWorkerId = 0 + this.nextWorkerNodeId = 0 return true } /** @inheritDoc */ public choose (): number { - const chosenWorkerKey = this.nextWorkerId - this.nextWorkerId = - this.nextWorkerId === this.pool.workers.length - 1 + const chosenWorkerNodeKey = this.nextWorkerNodeId + this.nextWorkerNodeId = + this.nextWorkerNodeId === this.pool.workerNodes.length - 1 ? 0 - : this.nextWorkerId + 1 - return chosenWorkerKey + : this.nextWorkerNodeId + 1 + return chosenWorkerNodeKey } /** @inheritDoc */ - public remove (workerKey: number): boolean { - if (this.nextWorkerId === workerKey) { - if (this.pool.workers.length === 0) { - this.nextWorkerId = 0 + public remove (workerNodeKey: number): boolean { + if (this.nextWorkerNodeId === workerNodeKey) { + if (this.pool.workerNodes.length === 0) { + this.nextWorkerNodeId = 0 } else { - this.nextWorkerId = - this.nextWorkerId > this.pool.workers.length - 1 - ? this.pool.workers.length - 1 - : this.nextWorkerId + this.nextWorkerNodeId = + this.nextWorkerNodeId > this.pool.workerNodes.length - 1 + ? this.pool.workerNodes.length - 1 + : this.nextWorkerNodeId } } return true