X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=2e708d973891be533e0d66f632ee5e4d983fed7a;hb=d18fd5d5f472454b75ebd5e197b8c1332a5e0db3;hp=52868fd7ec4360e62d9ab565995bb4ce532fde02;hpb=85aeb3f356d749b96361e74cf17d403a697e3dd7;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 52868fd7..2e708d97 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
@@ -56,30 +57,43 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (worker: Worker): Promise<void> {
-    this.sendToWorker(worker, { kill: true, workerId: worker.threadId })
-    const workerInfo = this.getWorkerInfoByWorker(worker)
-    workerInfo.messageChannel?.port1.close()
-    workerInfo.messageChannel?.port2.close()
+  protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flushTasksQueue(workerNodeKey)
+    // FIXME: wait for tasks to be finished
+    const workerNode = this.workerNodes[workerNodeKey]
+    const worker = workerNode.worker
+    const waitWorkerExit = new Promise<void>(resolve => {
+      worker.on('exit', () => {
+        resolve()
+      })
+    })
+    this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
+    workerNode.closeChannel()
     await worker.terminate()
+    await waitWorkerExit
   }
 
   /** @inheritDoc */
-  protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
+  protected sendToWorker (
+    workerNodeKey: number,
+    message: MessageValue<Data>,
+    transferList?: TransferListItem[]
+  ): void {
     (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
-    ).port1.postMessage(message)
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+    ).port1.postMessage(message, transferList)
   }
 
   /** @inheritDoc */
-  protected sendStartupMessageToWorker (worker: Worker): void {
+  protected sendStartupMessageToWorker (workerNodeKey: number): void {
+    const worker = this.workerNodes[workerNodeKey].worker
     const port2: MessagePort = (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port2
     worker.postMessage(
       {
         ready: false,
-        workerId: this.getWorkerInfoByWorker(worker).id as number,
+        workerId: worker.threadId,
         port: port2
       },
       [port2]
@@ -88,11 +102,11 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected registerWorkerMessageListener<Message extends Data | Response>(
-    worker: Worker,
+    workerNodeKey: number,
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port1.on('message', listener)
   }