X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=d2f4df8e43f8fe0a905e115510c0c22424891313;hb=bcc9e518ccacb739018c92de22011fa4e8d47ece;hp=28f8fceba679e5f9053820b8436583caf69f20af;hpb=fa548cda5120ac0708d82f37cd0ce1260d7f96c1;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 28f8fceb..d2f4df8e 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' @@ -12,18 +10,6 @@ import { AbstractPool } from '../abstract-pool' import { type PoolOptions, type PoolType, PoolTypes } from '../pool' 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 -} - /** * A thread pool with a fixed number of threads. * @@ -46,9 +32,10 @@ export class FixedThreadPool< public constructor ( numberOfThreads: number, filePath: string, - protected readonly opts: ThreadPoolOptions = {} + opts: PoolOptions = {}, + maximumNumberOfThreads?: number ) { - super(numberOfThreads, filePath, opts) + super(numberOfThreads, filePath, opts, maximumNumberOfThreads) } /** @inheritDoc */ @@ -56,25 +43,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, @@ -135,14 +103,6 @@ export class FixedThreadPool< ) } - /** @inheritDoc */ - protected createWorker (): Worker { - return new Worker(this.filePath, { - env: SHARE_ENV, - ...this.opts.workerOptions - }) - } - /** @inheritDoc */ protected get type (): PoolType { return PoolTypes.fixed