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

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 52868fd7..ddda04b1 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,46 @@ 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.flagWorkerNodeAsNotReady(workerNodeKey)
+    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.once('exit', () => {
+        resolve()
+      })
+    })
+    await this.sendKillMessageToWorker(workerNodeKey)
+    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.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    )?.port1?.postMessage(
+      { ...message, workerId: this.getWorkerInfo(workerNodeKey).id },
+      transferList
+    )
   }
 
   /** @inheritDoc */
-  protected sendStartupMessageToWorker (worker: Worker): void {
-    const port2: MessagePort = (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
-    ).port2
-    worker.postMessage(
+  protected sendStartupMessageToWorker (workerNodeKey: number): void {
+    const workerNode = this.workerNodes[workerNodeKey]
+    const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+      .port2
+    workerNode.worker.postMessage(
       {
         ready: false,
-        workerId: this.getWorkerInfoByWorker(worker).id as number,
+        workerId: this.getWorkerInfo(workerNodeKey).id,
         port: port2
       },
       [port2]
@@ -88,14 +105,34 @@ 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.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
     ).port1.on('message', listener)
   }
 
+  /** @inheritDoc */
+  protected registerOnceWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    ).port1.once('message', listener)
+  }
+
+  /** @inheritDoc */
+  protected deregisterWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    ).port1.off('message', listener)
+  }
+
   /** @inheritDoc */
   protected createWorker (): Worker {
     return new Worker(this.filePath, {
@@ -114,16 +151,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()