X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Fdynamic.ts;h=4a2fd5e807f1bf992155bc155a89d956616ef589;hb=3ec964d666b2ffa57b57a37a29542a727fc55ee6;hp=77f0a2d569618af2dbbd3d146078ae74be812165;hpb=729c563db85562dd7d0f7733b1a3e2d98467134b;p=poolifier.git

diff --git a/src/pools/thread/dynamic.ts b/src/pools/thread/dynamic.ts
index 77f0a2d5..4a2fd5e8 100644
--- a/src/pools/thread/dynamic.ts
+++ b/src/pools/thread/dynamic.ts
@@ -1,7 +1,8 @@
-import type { JSONValue, MessageValue } from '../../utility-types'
+import type { JSONValue } from '../../utility-types'
 import type { PoolOptions } from '../abstract-pool'
 import type { ThreadWorkerWithMessageChannel } from './fixed'
 import { FixedThreadPool } from './fixed'
+import { killBehaviorTypes } from '../../worker/worker-options'
 
 /**
  * A thread pool with a dynamic number of threads, but a guaranteed minimum number of threads.
@@ -42,34 +43,33 @@ export class DynamicThreadPool<
    * It will first check for and return an idle thread.
    * If all threads are busy, then it will try to create a new one up to the `max` thread count.
    * If the max thread count is reached, the emitter will emit a `FullPool` event and it will fall back to using a round robin algorithm to distribute the load.
+   *
+   * @returns Thread worker.
    */
   protected chooseWorker (): ThreadWorkerWithMessageChannel {
-    let worker: ThreadWorkerWithMessageChannel | undefined
-    for (const entry of this.tasks) {
-      if (entry[1] === 0) {
-        worker = entry[0]
-        break
+    for (const [worker, numberOfTasks] of this.tasks) {
+      if (numberOfTasks === 0) {
+        // A worker is free, use it
+        return worker
       }
     }
 
-    if (worker) {
-      // a worker is free, use it
-      return worker
-    } else {
-      if (this.workers.length === this.max) {
-        this.emitter.emit('FullPool')
-        return super.chooseWorker()
-      }
-      // all workers are busy create a new worker
-      const worker = this.internalNewWorker()
-      worker.port2?.on('message', (message: MessageValue<Data>) => {
-        if (message.kill) {
-          this.sendToWorker(worker, { kill: 1 })
-          void this.destroyWorker(worker)
-          this.removeWorker(worker)
-        }
-      })
-      return worker
+    if (this.workers.length === this.max) {
+      this.emitter.emit('FullPool')
+      return super.chooseWorker()
     }
+
+    // All workers are busy, create a new worker
+    const workerCreated = this.createAndSetupWorker()
+    this.registerWorkerMessageListener<Data>(workerCreated, message => {
+      const tasksInProgress = this.tasks.get(workerCreated)
+      const isKillBehaviorOptionHard = message.kill === killBehaviorTypes.HARD
+      if (isKillBehaviorOptionHard || tasksInProgress === 0) {
+        // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime)
+        this.sendToWorker(workerCreated, { kill: 1 })
+        void this.destroyWorker(workerCreated)
+      }
+    })
+    return workerCreated
   }
 }