X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fabstract-pool.ts;h=a840dc740116057f8fa7867f85348a676caf04a4;hb=ffe8ca52bf1a05f68a0c939d16f15b6b54028be9;hp=1668813354538bfcf5d8a39c38007c5d0f42755d;hpb=ff733df7ebd4813628b27a5d27d509163e12af84;p=poolifier.git diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts index 16688133..a840dc74 100644 --- a/src/pools/abstract-pool.ts +++ b/src/pools/abstract-pool.ts @@ -33,12 +33,12 @@ export abstract class AbstractPool< public readonly emitter?: PoolEmitter /** - * The promise response map. + * The execution response promise map. * * - `key`: The message id of each submitted task. - * - `value`: An object that contains the worker, the promise resolve and reject callbacks. + * - `value`: An object that contains the worker, the execution response promise resolve and reject callbacks. * - * When we receive a message from the worker we get a map entry with the promise resolve/reject bound to the message. + * When we receive a message from the worker, we get a map entry with the promise resolve/reject bound to the message id. */ protected promiseResponseMap: Map< string, @@ -76,9 +76,9 @@ export abstract class AbstractPool< this.checkPoolOptions(this.opts) this.chooseWorkerNode.bind(this) - this.internalExecute.bind(this) + this.executeTask.bind(this) + this.enqueueTask.bind(this) this.checkAndEmitEvents.bind(this) - this.sendToWorker.bind(this) this.setupHook() @@ -93,7 +93,11 @@ export abstract class AbstractPool< Worker, Data, Response - >(this, this.opts.workerChoiceStrategy) + >( + this, + this.opts.workerChoiceStrategy, + this.opts.workerChoiceStrategyOptions + ) } private checkFilePath (filePath: string): void { @@ -127,6 +131,8 @@ export abstract class AbstractPool< this.opts.workerChoiceStrategy = opts.workerChoiceStrategy ?? WorkerChoiceStrategies.ROUND_ROBIN this.checkValidWorkerChoiceStrategy(this.opts.workerChoiceStrategy) + this.opts.workerChoiceStrategyOptions = + opts.workerChoiceStrategyOptions ?? { medRunTime: false } this.opts.enableEvents = opts.enableEvents ?? true this.opts.enableTasksQueue = opts.enableTasksQueue ?? false } @@ -185,21 +191,16 @@ export abstract class AbstractPool< ): void { this.checkValidWorkerChoiceStrategy(workerChoiceStrategy) this.opts.workerChoiceStrategy = workerChoiceStrategy - for (const [index, workerNode] of this.workerNodes.entries()) { - this.setWorkerNode( - index, - workerNode.worker, - { - run: 0, - running: 0, - runTime: 0, - runTimeHistory: new CircularArray(), - avgRunTime: 0, - medRunTime: 0, - error: 0 - }, - workerNode.tasksQueue - ) + for (const workerNode of this.workerNodes) { + this.setWorkerNodeTasksUsage(workerNode, { + run: 0, + running: 0, + runTime: 0, + runTimeHistory: new CircularArray(), + avgRunTime: 0, + medRunTime: 0, + error: 0 + }) } this.workerChoiceStrategyContext.setWorkerChoiceStrategy( workerChoiceStrategy @@ -213,10 +214,7 @@ export abstract class AbstractPool< public abstract get busy (): boolean protected internalBusy (): boolean { - return ( - this.numberOfRunningTasks >= this.numberOfWorkers && - this.findFreeWorkerNodeKey() === -1 - ) + return this.findFreeWorkerNodeKey() === -1 } /** @inheritDoc */ @@ -234,16 +232,21 @@ export abstract class AbstractPool< data: data ?? ({} as Data), id: crypto.randomUUID() } - const res = this.internalExecute(workerNodeKey, workerNode, submittedTask) - let currentTask: Task = submittedTask + const res = new Promise((resolve, reject) => { + this.promiseResponseMap.set(submittedTask.id, { + resolve, + reject, + worker: workerNode.worker + }) + }) if ( this.opts.enableTasksQueue === true && - (this.busy || this.tasksQueueLength(workerNodeKey) > 0) + (this.busy || this.workerNodes[workerNodeKey].tasksUsage.running > 0) ) { this.enqueueTask(workerNodeKey, submittedTask) - currentTask = this.dequeueTask(workerNodeKey) as Task + } else { + this.executeTask(workerNodeKey, submittedTask) } - this.sendToWorker(workerNode.worker, currentTask) this.checkAndEmitEvents() // eslint-disable-next-line @typescript-eslint/return-await return res @@ -252,8 +255,8 @@ export abstract class AbstractPool< /** @inheritDoc */ public async destroy (): Promise { await Promise.all( - this.workerNodes.map(async workerNode => { - this.flushTasksQueueByWorker(workerNode.worker) + this.workerNodes.map(async (workerNode, workerNodeKey) => { + this.flushTasksQueue(workerNodeKey) await this.destroyWorker(workerNode.worker) }) ) @@ -267,7 +270,7 @@ export abstract class AbstractPool< protected abstract destroyWorker (worker: Worker): void | Promise /** - * Setup hook to run code before worker node are created in the abstract constructor. + * Setup hook to execute code before worker node are created in the abstract constructor. * Can be overridden * * @virtual @@ -282,23 +285,23 @@ export abstract class AbstractPool< protected abstract isMain (): boolean /** - * Hook executed before the worker task promise resolution. + * Hook executed before the worker task execution. * Can be overridden. * * @param workerNodeKey - The worker node key. */ - protected beforePromiseResponseHook (workerNodeKey: number): void { + protected beforeTaskExecutionHook (workerNodeKey: number): void { ++this.workerNodes[workerNodeKey].tasksUsage.running } /** - * Hook executed after the worker task promise resolution. + * Hook executed after the worker task execution. * Can be overridden. * * @param worker - The worker. * @param message - The received message. */ - protected afterPromiseResponseHook ( + protected afterTaskExecutionHook ( worker: Worker, message: MessageValue ): void { @@ -333,11 +336,7 @@ export abstract class AbstractPool< */ protected chooseWorkerNode (): [number, WorkerNode] { let workerNodeKey: number - if ( - this.type === PoolType.DYNAMIC && - !this.full && - this.findFreeWorkerNodeKey() === -1 - ) { + if (this.type === PoolType.DYNAMIC && !this.full && this.internalBusy()) { const workerCreated = this.createAndSetupWorker() this.registerWorkerMessageListener(workerCreated, message => { if ( @@ -423,7 +422,7 @@ export abstract class AbstractPool< protected workerListener (): (message: MessageValue) => void { return message => { if (message.id != null) { - // Task response received + // Task execution response received const promiseResponse = this.promiseResponseMap.get(message.id) if (promiseResponse != null) { if (message.error != null) { @@ -431,15 +430,15 @@ export abstract class AbstractPool< } else { promiseResponse.resolve(message.data as Response) } - this.afterPromiseResponseHook(promiseResponse.worker, message) + this.afterTaskExecutionHook(promiseResponse.worker, message) this.promiseResponseMap.delete(message.id) const workerNodeKey = this.getWorkerNodeKey(promiseResponse.worker) if ( this.opts.enableTasksQueue === true && - this.tasksQueueLength(workerNodeKey) > 0 + this.tasksQueueSize(workerNodeKey) > 0 ) { - this.sendToWorker( - promiseResponse.worker, + this.executeTask( + workerNodeKey, this.dequeueTask(workerNodeKey) as Task ) } @@ -448,21 +447,6 @@ export abstract class AbstractPool< } } - private async internalExecute ( - workerNodeKey: number, - workerNode: WorkerNode, - task: Task - ): Promise { - this.beforePromiseResponseHook(workerNodeKey) - return await new Promise((resolve, reject) => { - this.promiseResponseMap.set(task.id, { - resolve, - reject, - worker: workerNode.worker - }) - }) - } - private checkAndEmitEvents (): void { if (this.opts.enableEvents === true) { if (this.busy) { @@ -474,6 +458,19 @@ export abstract class AbstractPool< } } + /** + * Sets the given worker node its tasks usage in the pool. + * + * @param workerNode - The worker node. + * @param tasksUsage - The worker node tasks usage. + */ + private setWorkerNodeTasksUsage ( + workerNode: WorkerNode, + tasksUsage: TasksUsage + ): void { + workerNode.tasksUsage = tasksUsage + } + /** * Gets the given worker its tasks usage in the pool. * @@ -536,34 +533,38 @@ export abstract class AbstractPool< * * @param worker - The worker. */ - protected removeWorkerNode (worker: Worker): void { + private removeWorkerNode (worker: Worker): void { const workerNodeKey = this.getWorkerNodeKey(worker) this.workerNodes.splice(workerNodeKey, 1) this.workerChoiceStrategyContext.remove(workerNodeKey) } - protected enqueueTask (workerNodeKey: number, task: Task): void { - this.workerNodes[workerNodeKey].tasksQueue.push(task) + private executeTask (workerNodeKey: number, task: Task): void { + this.beforeTaskExecutionHook(workerNodeKey) + this.sendToWorker(this.workerNodes[workerNodeKey].worker, task) + } + + private enqueueTask (workerNodeKey: number, task: Task): number { + return this.workerNodes[workerNodeKey].tasksQueue.push(task) } - protected dequeueTask (workerNodeKey: number): Task | undefined { + private dequeueTask (workerNodeKey: number): Task | undefined { return this.workerNodes[workerNodeKey].tasksQueue.shift() } - protected tasksQueueLength (workerNodeKey: number): number { + private tasksQueueSize (workerNodeKey: number): number { return this.workerNodes[workerNodeKey].tasksQueue.length } - protected flushTasksQueue (workerNodeKey: number): void { - if (this.tasksQueueLength(workerNodeKey) > 0) { + private flushTasksQueue (workerNodeKey: number): void { + if (this.tasksQueueSize(workerNodeKey) > 0) { for (const task of this.workerNodes[workerNodeKey].tasksQueue) { - this.sendToWorker(this.workerNodes[workerNodeKey].worker, task) + this.executeTask(workerNodeKey, task) } - this.workerNodes[workerNodeKey].tasksQueue = [] } } - protected flushTasksQueueByWorker (worker: Worker): void { + private flushTasksQueueByWorker (worker: Worker): void { const workerNodeKey = this.getWorkerNodeKey(worker) this.flushTasksQueue(workerNodeKey) }