X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fabstract-pool.ts;h=0c4b59c92fef071bbddd487d1490ed5d2f8db38b;hb=f9ab13ca6b2cc8e96ab98910e2d3501981c3fc30;hp=7944606d9c84dbcc7dc32a9547c8a6e425b48e01;hpb=a35560bac09e829e1e19f88f8fd1d71a64c9d50b;p=poolifier.git diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts index 7944606d..0c4b59c9 100644 --- a/src/pools/abstract-pool.ts +++ b/src/pools/abstract-pool.ts @@ -1,4 +1,8 @@ -import type { MessageValue } from '../utility-types' +import type { + MessageValue, + PromiseWorkerResponseWrapper +} from '../utility-types' +import { isKillBehavior, KillBehaviors } from '../worker/worker-options' import type { IPoolInternal } from './pool-internal' import { PoolEmitter } from './pool-internal' import type { WorkerChoiceStrategy } from './selection-strategies' @@ -79,15 +83,6 @@ export interface PoolOptions { * A function that will listen for exit event on each worker. */ exitHandler?: ExitHandler - /** - * This is just to avoid non-useful warning messages. - * - * Will be used to set `maxListeners` on event emitters (workers are event emitters). - * - * @default 1000 - * @see [Node events emitter.setMaxListeners(n)](https://nodejs.org/api/events.html#events_emitter_setmaxlisteners_n) - */ - maxTasks?: number /** * The work choice strategy to use in this pool. */ @@ -115,6 +110,19 @@ export abstract class AbstractPool< /** @inheritdoc */ public readonly emitter: PoolEmitter + /** + * The promise map. + * + * - `key`: This is the message ID of each submitted task. + * - `value`: An object that contains the worker, the resolve function and the reject function. + * + * When we receive a message from the worker we get a map entry and resolve/reject the promise based on the message. + */ + protected promiseMap: Map< + number, + PromiseWorkerResponseWrapper + > = new Map>() + /** * ID of the next message. */ @@ -136,16 +144,17 @@ export abstract class AbstractPool< * * @param numberOfWorkers Number of workers that this pool should manage. * @param filePath Path to the worker-file. - * @param opts Options for the pool. Default: `{ maxTasks: 1000 }` + * @param opts Options for the pool. */ public constructor ( public readonly numberOfWorkers: number, public readonly filePath: string, - public readonly opts: PoolOptions = { maxTasks: 1000 } + public readonly opts: PoolOptions ) { if (!this.isMain()) { throw new Error('Cannot start a pool from a worker!') } + this.checkNumberOfWorkers(this.numberOfWorkers) this.checkFilePath(this.filePath) this.setupHook() @@ -156,6 +165,20 @@ export abstract class AbstractPool< this.emitter = new PoolEmitter() this.workerChoiceStrategyContext = new WorkerChoiceStrategyContext( this, + () => { + const workerCreated = this.createAndSetupWorker() + this.registerWorkerMessageListener(workerCreated, message => { + const tasksInProgress = this.tasks.get(workerCreated) + if ( + isKillBehavior(KillBehaviors.HARD, message.kill) || + tasksInProgress === 0 + ) { + // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime) + void this.destroyWorker(workerCreated) + } + }) + return workerCreated + }, opts.workerChoiceStrategy ?? WorkerChoiceStrategies.ROUND_ROBIN ) } @@ -166,8 +189,26 @@ export abstract class AbstractPool< } } + private checkNumberOfWorkers (numberOfWorkers: number): void { + if (numberOfWorkers == null) { + throw new Error( + 'Cannot instantiate a pool without specifying the number of workers' + ) + } else if (!Number.isSafeInteger(numberOfWorkers)) { + throw new Error( + 'Cannot instantiate a pool with a non integer number of workers' + ) + } else if (numberOfWorkers < 0) { + throw new Error( + 'Cannot instantiate a pool with a negative number of workers' + ) + } else if (!this.dynamic && numberOfWorkers === 0) { + throw new Error('Cannot instantiate a fixed pool with no worker') + } + } + /** @inheritdoc */ - public isDynamic (): boolean { + public get dynamic (): boolean { return false } @@ -175,6 +216,7 @@ export abstract class AbstractPool< public setWorkerChoiceStrategy ( workerChoiceStrategy: WorkerChoiceStrategy ): void { + this.opts.workerChoiceStrategy = workerChoiceStrategy this.workerChoiceStrategyContext.setWorkerChoiceStrategy( workerChoiceStrategy ) @@ -196,8 +238,12 @@ export abstract class AbstractPool< await Promise.all(this.workers.map(worker => this.destroyWorker(worker))) } - /** @inheritdoc */ - public abstract destroyWorker (worker: Worker): void | Promise + /** + * Shut down given worker. + * + * @param worker A worker within `workers`. + */ + protected abstract destroyWorker (worker: Worker): void | Promise /** * Setup hook that can be overridden by a Poolifier pool implementation @@ -279,12 +325,13 @@ export abstract class AbstractPool< message: MessageValue ): void - /** @inheritdoc */ - public abstract registerWorkerMessageListener< - Message extends Data | Response - > (worker: Worker, listener: (message: MessageValue) => void): void - - protected abstract unregisterWorkerMessageListener< + /** + * Register a listener callback on a given worker. + * + * @param worker A worker. + * @param listener A message listener callback. + */ + protected abstract registerWorkerMessageListener< Message extends Data | Response > (worker: Worker, listener: (message: MessageValue) => void): void @@ -292,16 +339,8 @@ export abstract class AbstractPool< worker: Worker, messageId: number ): Promise { - return new Promise((resolve, reject) => { - const listener: (message: MessageValue) => void = message => { - if (message.id === messageId) { - this.unregisterWorkerMessageListener(worker, listener) - this.decreaseWorkersTasks(worker) - if (message.error) reject(message.error) - else resolve(message.data as Response) - } - } - this.registerWorkerMessageListener(worker, listener) + return new Promise((resolve, reject) => { + this.promiseMap.set(messageId, { resolve, reject, worker }) }) } @@ -319,8 +358,12 @@ export abstract class AbstractPool< */ protected abstract afterWorkerSetup (worker: Worker): void - /** @inheritdoc */ - public createAndSetupWorker (): Worker { + /** + * Creates a new worker for this pool and sets it up completely. + * + * @returns New, completely set up worker. + */ + protected createAndSetupWorker (): Worker { const worker: Worker = this.createWorker() worker.on('error', this.opts.errorHandler ?? EMPTY_FUNCTION) @@ -337,4 +380,23 @@ export abstract class AbstractPool< return worker } + + /** + * This function is the listener registered for each worker. + * + * @returns The listener function to execute when a message is sent from a worker. + */ + protected workerListener (): (message: MessageValue) => void { + return message => { + if (message.id) { + const value = this.promiseMap.get(message.id) + if (value) { + this.decreaseWorkersTasks(value.worker) + if (message.error) value.reject(message.error) + else value.resolve(message.data as Response) + this.promiseMap.delete(message.id) + } + } + } + } }