X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=32107e48635314e25269cc37e2c0ad7fdd3fcd75;hb=0676e5d32c8f8ee5c5b7f5998f4973b0a276460f;hp=a575d0972ff6611fadcbb662e195f31bf118a6d7;hpb=81c02522f2c5538a8e5ce341678724132d4da8ba;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index a575d097..32107e48 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -2,6 +2,7 @@ import { type MessageChannel, type MessagePort, SHARE_ENV, + type TransferListItem, Worker, type WorkerOptions, isMainThread @@ -61,32 +62,33 @@ export class FixedThreadPool< // FIXME: wait for tasks to be finished const workerNode = this.workerNodes[workerNodeKey] const worker = workerNode.worker - const workerExitPromise = new Promise(resolve => { + const waitWorkerExit = new Promise((resolve) => { worker.on('exit', () => { resolve() }) }) - this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId }) + await this.sendKillMessageToWorker(workerNodeKey, worker.threadId) workerNode.closeChannel() await worker.terminate() - await workerExitPromise + await waitWorkerExit } /** @inheritDoc */ protected sendToWorker ( workerNodeKey: number, - message: MessageValue + message: MessageValue, + transferList?: TransferListItem[] ): void { ( - this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel - ).port1.postMessage(message) + this.workerNodes[workerNodeKey].messageChannel as MessageChannel + ).port1.postMessage(message, transferList) } /** @inheritDoc */ protected sendStartupMessageToWorker (workerNodeKey: number): void { const worker = this.workerNodes[workerNodeKey].worker const port2: MessagePort = ( - this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel + this.workerNodes[workerNodeKey].messageChannel as MessageChannel ).port2 worker.postMessage( { @@ -104,7 +106,7 @@ export class FixedThreadPool< listener: (message: MessageValue) => void ): void { ( - this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel + this.workerNodes[workerNodeKey].messageChannel as MessageChannel ).port1.on('message', listener) } @@ -126,16 +128,6 @@ export class FixedThreadPool< return WorkerTypes.thread } - /** @inheritDoc */ - protected get minSize (): number { - return this.numberOfWorkers - } - - /** @inheritDoc */ - protected get maxSize (): number { - return this.numberOfWorkers - } - /** @inheritDoc */ protected get busy (): boolean { return this.internalBusy()