X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=d69055cf0909efa3b9cf45983163e0be6a35c513;hb=b6fea09e6a8174e664770741943cf08445066e2b;hp=13e4a11a50028364c055b6b60aca5cb03b87fcfd;hpb=1e3214b63e262557aadebf3c57e8388de6a4bbe4;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 13e4a11a..d69055cf 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -67,7 +67,10 @@ export class FixedThreadPool< resolve() }) }) - await this.sendKillMessageToWorker(workerNodeKey, worker.threadId) + await this.sendKillMessageToWorker( + workerNodeKey, + workerNode.info.id as number + ) workerNode.closeChannel() await worker.terminate() await waitWorkerExit @@ -80,20 +83,20 @@ export class FixedThreadPool< transferList?: TransferListItem[] ): void { ( - this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel + 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 - ).port2 + const workerNode = this.workerNodes[workerNodeKey] + const worker = workerNode.worker + const port2: MessagePort = (workerNode.messageChannel as MessageChannel) + .port2 worker.postMessage( { ready: false, - workerId: worker.threadId, + workerId: workerNode.info.id, port: port2 }, [port2] @@ -106,7 +109,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) } @@ -128,16 +131,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()