X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fpools%2Fthread%2Ffixed.ts;h=8dd4e7e33e422b4467a76931b201c45c0ad80712;hb=7884d1837ee55026fe5204a56f4ebeca17e7e7dd;hp=7199baf8fdf5ad52bc43bcfdfe107de84719589a;hpb=c2301b8e5ab9a84e16dd037c6f7e3e85030bb266;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 7199baf8..8dd4e7e3 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,12 +62,12 @@ export class FixedThreadPool< // FIXME: wait for tasks to be finished const workerNode = this.workerNodes[workerNodeKey] const worker = workerNode.worker - const waitWorkerExit = 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 waitWorkerExit @@ -75,18 +76,19 @@ export class FixedThreadPool< /** @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) }