X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=7199baf8fdf5ad52bc43bcfdfe107de84719589a;hb=c2301b8e5ab9a84e16dd037c6f7e3e85030bb266;hp=bef82826350d772c146656d4676f942923d33165;hpb=3f09ed9f86ed44b7551d160452b80b978d14e8e3;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index bef82826..7199baf8 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -56,23 +56,37 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (worker: Worker): Promise<void> {
-    this.sendToWorker(worker, { kill: true, workerId: worker.threadId })
-    this.workerNodes[this.getWorkerNodeKey(worker)].closeChannel()
+  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>
+  ): void {
     (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port1.postMessage(message)
   }
 
   /** @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(
       {
@@ -86,11 +100,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)
   }