X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fthread%2Ffixed.ts;h=a9d8f685fec3432db4fc6829dabcfd84f146babe;hb=70e79e39c8c80f90dc8875cc74f2d5c4c077cf15;hp=cd414502cfd8a706e8d30836b23a90ce64c35a91;hpb=a05c10de598321c3ad8005f32b1cd082ec1500f5;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index cd414502..a9d8f685 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -1,8 +1,31 @@ -import { isMainThread, MessageChannel, SHARE_ENV, Worker } from 'worker_threads' +import { + MessageChannel, + SHARE_ENV, + Worker, + type WorkerOptions, + isMainThread +} from 'node:worker_threads' import type { Draft, MessageValue } from '../../utility-types' import { AbstractPool } from '../abstract-pool' -import type { PoolOptions } from '../pool' -import { PoolType } from '../pool-internal' +import { + type PoolOptions, + type PoolType, + PoolTypes, + type WorkerType, + WorkerTypes +} from '../pool' + +/** + * Options for a poolifier thread pool. + */ +export interface ThreadPoolOptions extends PoolOptions { + /** + * Worker options. + * + * @see https://nodejs.org/api/worker_threads.html#new-workerfilename-options + */ + workerOptions?: WorkerOptions +} /** * A thread worker with message channels for communication between main thread and thread worker. @@ -16,8 +39,8 @@ export type ThreadWorkerWithMessageChannel = Worker & Draft * * This pool selects the threads in a round robin fashion. * - * @template DataType of data sent to the worker. This can only be serializable data. - * @template ResponseType of response of execution. This can only be serializable data. + * @typeParam Data - Type of data sent to the worker. This can only be serializable data. + * @typeParam Response - Type of execution response. This can only be serializable data. * @author [Alessandro Pio Ardizio](https://github.com/pioardi) * @since 0.0.1 */ @@ -28,14 +51,14 @@ export class FixedThreadPool< /** * Constructs a new poolifier fixed thread pool. * - * @param numberOfThreads Number of threads for this pool. - * @param filePath Path to an implementation of a `ThreadWorker` file, which can be relative or absolute. - * @param opts Options for this fixed thread pool. + * @param numberOfThreads - Number of threads for this pool. + * @param filePath - Path to an implementation of a `ThreadWorker` file, which can be relative or absolute. + * @param opts - Options for this fixed thread pool. */ public constructor ( numberOfThreads: number, filePath: string, - opts: PoolOptions = {} + protected readonly opts: ThreadPoolOptions = {} ) { super(numberOfThreads, filePath, opts) } @@ -46,7 +69,7 @@ export class FixedThreadPool< } /** @inheritDoc */ - public async destroyWorker ( + protected async destroyWorker ( worker: ThreadWorkerWithMessageChannel ): Promise { this.sendToWorker(worker, { kill: 1 }) @@ -62,17 +85,18 @@ export class FixedThreadPool< } /** @inheritDoc */ - public registerWorkerMessageListener ( - messageChannel: ThreadWorkerWithMessageChannel, + protected registerWorkerMessageListener( + worker: ThreadWorkerWithMessageChannel, listener: (message: MessageValue) => void ): void { - messageChannel.port2?.on('message', listener) + worker.port2?.on('message', listener) } /** @inheritDoc */ protected createWorker (): ThreadWorkerWithMessageChannel { return new Worker(this.filePath, { - env: SHARE_ENV + env: SHARE_ENV, + ...this.opts.workerOptions }) } @@ -87,12 +111,27 @@ export class FixedThreadPool< } /** @inheritDoc */ - public get type (): PoolType { - return PoolType.FIXED + protected get type (): PoolType { + return PoolTypes.fixed + } + + /** @inheritDoc */ + protected get worker (): WorkerType { + return WorkerTypes.thread + } + + /** @inheritDoc */ + protected get minSize (): number { + return this.numberOfWorkers + } + + /** @inheritDoc */ + protected get maxSize (): number { + return this.numberOfWorkers } /** @inheritDoc */ - public get busy (): boolean { - return this.internalGetBusyStatus() + protected get busy (): boolean { + return this.internalBusy() } }