X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=f48d0bcd9960da1a2ff89582035a9ad9a9581774;hb=d1c03778bd26af064147055fc21d6701ffefb707;hp=c9145f571186a9d5783531236414aff7eadd463e;hpb=84d0f4f2937987e5adbb8cfa94839eaf050c7502;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index c9145f57..f48d0bcd 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -1,7 +1,8 @@ import { - SHARE_ENV, - Worker, - type WorkerOptions, + type MessageChannel, + type MessagePort, + type TransferListItem, + type Worker, isMainThread } from 'node:worker_threads' import type { MessageValue } from '../../utility-types' @@ -12,14 +13,7 @@ import { type WorkerType, WorkerTypes } from '../worker' /** * 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 -} +export type ThreadPoolOptions = PoolOptions /** * A thread pool with a fixed number of threads. @@ -43,9 +37,10 @@ export class FixedThreadPool< public constructor ( numberOfThreads: number, filePath: string, - protected readonly opts: ThreadPoolOptions = {} + opts: ThreadPoolOptions = {}, + maximumNumberOfThreads?: number ) { - super(numberOfThreads, filePath, opts) + super(numberOfThreads, filePath, opts, maximumNumberOfThreads) } /** @inheritDoc */ @@ -54,42 +49,83 @@ export class FixedThreadPool< } /** @inheritDoc */ - protected async destroyWorker (worker: Worker): Promise { - this.sendToWorker(worker, { kill: true, workerId: worker.threadId }) - await worker.terminate() + protected sendToWorker ( + workerNodeKey: number, + message: MessageValue, + transferList?: TransferListItem[] + ): void { + this.workerNodes[workerNodeKey].messageChannel?.port1?.postMessage( + { ...message, workerId: this.getWorkerInfo(workerNodeKey).id }, + transferList + ) } /** @inheritDoc */ - protected sendToWorker (worker: Worker, message: MessageValue): void { - worker.postMessage(message) + protected sendStartupMessageToWorker (workerNodeKey: number): void { + const workerNode = this.workerNodes[workerNodeKey] + const port2: MessagePort = (workerNode.messageChannel as MessageChannel) + .port2 + workerNode.worker.postMessage( + { + ready: false, + workerId: this.getWorkerInfo(workerNodeKey).id, + port: port2 + }, + [port2] + ) } /** @inheritDoc */ - protected createWorker (): Worker { - return new Worker(this.filePath, { - env: SHARE_ENV, - ...this.opts.workerOptions - }) + protected registerWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].messageChannel?.port1?.on( + 'message', + listener + ) } /** @inheritDoc */ - protected get type (): PoolType { - return PoolTypes.fixed + protected registerOnceWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].messageChannel?.port1?.once( + 'message', + listener + ) } /** @inheritDoc */ - protected get worker (): WorkerType { - return WorkerTypes.thread + protected deregisterWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].messageChannel?.port1?.off( + 'message', + listener + ) + } + + /** @inheritDoc */ + protected shallCreateDynamicWorker (): boolean { + return false } /** @inheritDoc */ - protected get minSize (): number { - return this.numberOfWorkers + protected checkAndEmitDynamicWorkerCreationEvents (): void { + /* noop */ } /** @inheritDoc */ - protected get maxSize (): number { - return this.numberOfWorkers + protected get type (): PoolType { + return PoolTypes.fixed + } + + /** @inheritDoc */ + protected get worker (): WorkerType { + return WorkerTypes.thread } /** @inheritDoc */