X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=f48d0bcd9960da1a2ff89582035a9ad9a9581774;hb=d1c03778bd26af064147055fc21d6701ffefb707;hp=28f8fceba679e5f9053820b8436583caf69f20af;hpb=e5c1b3572e6fe4cd11b32742c37039f3a6b3c373;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 28f8fceb..f48d0bcd 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -1,10 +1,8 @@ import { type MessageChannel, type MessagePort, - SHARE_ENV, type TransferListItem, - Worker, - type WorkerOptions, + type Worker, isMainThread } from 'node:worker_threads' import type { MessageValue } from '../../utility-types' @@ -15,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. @@ -46,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 */ @@ -56,25 +48,6 @@ export class FixedThreadPool< return isMainThread } - /** @inheritDoc */ - protected async destroyWorkerNode (workerNodeKey: number): Promise { - this.flagWorkerNodeAsNotReady(workerNodeKey) - this.flushTasksQueue(workerNodeKey) - // FIXME: wait for tasks to be finished - const workerNode = this.workerNodes[workerNodeKey] - const worker = workerNode.worker - const waitWorkerExit = new Promise(resolve => { - worker.once('exit', () => { - resolve() - }) - }) - await this.sendKillMessageToWorker(workerNodeKey) - workerNode.closeChannel() - workerNode.removeAllListeners() - await worker.terminate() - await waitWorkerExit - } - /** @inheritDoc */ protected sendToWorker ( workerNodeKey: number, @@ -136,11 +109,13 @@ export class FixedThreadPool< } /** @inheritDoc */ - protected createWorker (): Worker { - return new Worker(this.filePath, { - env: SHARE_ENV, - ...this.opts.workerOptions - }) + protected shallCreateDynamicWorker (): boolean { + return false + } + + /** @inheritDoc */ + protected checkAndEmitDynamicWorkerCreationEvents (): void { + /* noop */ } /** @inheritDoc */