X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Fdynamic.ts;h=05b61684173af58c7ed7dbbc52218c874a35fa7a;hb=0527b6db895355140ed6fa2f740caab3a41b2f9f;hp=26d81d2fc15c99aa33a12088e225ab0889f534f4;hpb=8780c880a2cf08680092f6e41fb82600b196455c;p=poolifier.git

diff --git a/src/pools/thread/dynamic.ts b/src/pools/thread/dynamic.ts
index 26d81d2f..05b61684 100644
--- a/src/pools/thread/dynamic.ts
+++ b/src/pools/thread/dynamic.ts
@@ -1,5 +1,5 @@
-import type { JSONValue } from '../../utility-types'
-import type { PoolOptions } from '../abstract-pool'
+import type { PoolOptions } from '../pool'
+import { PoolType } from '../pool-internal'
 import type { ThreadWorkerWithMessageChannel } from './fixed'
 import { FixedThreadPool } from './fixed'
 
@@ -7,68 +7,46 @@ import { FixedThreadPool } from './fixed'
  * A thread pool with a dynamic number of threads, but a guaranteed minimum number of threads.
  *
  * This thread pool creates new threads when the others are busy, up to the maximum number of threads.
- * When the maximum number of threads is reached, an event is emitted. If you want to listen to this event, use the pool's `emitter`.
- *
- * @template Data Type of data sent to the worker.
- * @template Response Type of response of execution.
+ * When the maximum number of threads is reached and workers are busy, an event is emitted. If you want to listen to this event, use the pool's `emitter`.
  *
+ * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
+ * @typeParam Response - Type of response of execution. This can only be serializable data.
  * @author [Alessandro Pio Ardizio](https://github.com/pioardi)
  * @since 0.0.1
  */
 export class DynamicThreadPool<
-  Data extends JSONValue = JSONValue,
-  Response extends JSONValue = JSONValue
+  Data = unknown,
+  Response = unknown
 > extends FixedThreadPool<Data, Response> {
   /**
    * Constructs a new poolifier dynamic thread pool.
    *
-   * @param min Minimum number of threads which are always active.
-   * @param max Maximum number of threads that can be created by this pool.
-   * @param filename Path to an implementation of a `ThreadWorker` file, which can be relative or absolute.
-   * @param opts Options for this fixed thread pool. Default: `{ maxTasks: 1000 }`
+   * @param min - Minimum number of threads which are always active.
+   * @param max - Maximum number of threads that can be created by this pool.
+   * @param filePath - Path to an implementation of a `ThreadWorker` file, which can be relative or absolute.
+   * @param opts - Options for this dynamic thread pool.
    */
   public constructor (
     min: number,
     public readonly max: number,
-    filename: string,
-    opts: PoolOptions<ThreadWorkerWithMessageChannel> = { maxTasks: 1000 }
+    filePath: string,
+    opts: PoolOptions<ThreadWorkerWithMessageChannel> = {}
   ) {
-    super(min, filename, opts)
+    super(min, filePath, opts)
   }
 
-  /**
-   * Choose a thread for the next task.
-   *
-   * 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 {
-    for (const [worker, numberOfTasks] of this.tasks) {
-      if (numberOfTasks === 0) {
-        // A worker is free, use it
-        return worker
-      }
-    }
+  /** @inheritDoc */
+  public get type (): PoolType {
+    return PoolType.DYNAMIC
+  }
 
-    if (this.workers.length === this.max) {
-      this.emitter.emit('FullPool')
-      return super.chooseWorker()
-    }
+  /** @inheritDoc */
+  public get full (): boolean {
+    return this.workerNodes.length === this.max
+  }
 
-    // All workers are busy, create a new worker
-    const worker = this.createAndSetupWorker()
-    this.registerWorkerMessageListener<Data>(worker, message => {
-      const tasksInProgress = this.tasks.get(worker)
-      if (message.kill && tasksInProgress === 0) {
-        // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime)
-        // To handle the case of a long-running task we will check if there is any active task
-        this.sendToWorker(worker, { kill: 1 })
-        void this.destroyWorker(worker)
-      }
-    })
-    return worker
+  /** @inheritDoc */
+  public get busy (): boolean {
+    return this.full && this.internalBusy()
   }
 }