X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=32107e48635314e25269cc37e2c0ad7fdd3fcd75;hb=0676e5d32c8f8ee5c5b7f5998f4973b0a276460f;hp=2e708d973891be533e0d66f632ee5e4d983fed7a;hpb=97f1a1937ea807d43d607cae893af68b0fc46167;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 2e708d97..32107e48 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -62,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<void>(resolve => {
+    const waitWorkerExit = new Promise<void>((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
@@ -80,7 +80,7 @@ export class FixedThreadPool<
     transferList?: TransferListItem[]
   ): void {
     (
-      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
     ).port1.postMessage(message, transferList)
   }
 
@@ -88,7 +88,7 @@ export class FixedThreadPool<
   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(
       {
@@ -106,7 +106,7 @@ export class FixedThreadPool<
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
     ).port1.on('message', listener)
   }
 
@@ -128,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()