X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=a263335c1bd59682220be9ebcfdc281c0e067d6d;hb=5767874516784070db4445321b5212ad7e5a84b4;hp=cf22c0a8e865587166ec362431474c693f41e7c8;hpb=322c9192eaa7142da1bf475cc2c6588ca72d922c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index cf22c0a8..a263335c 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,48 +1,47 @@
-import { DynamicThreadPool, PoolOptions } from 'poolifier';
+import { WorkerData, WorkerOptions } from '../types/Worker';
 
+import { DynamicThreadPool } from 'poolifier';
 import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
 import WorkerAbstract from './WorkerAbstract';
-import { WorkerData } from '../types/Worker';
+import { WorkerUtils } from './WorkerUtils';
 
-export default class WorkerDynamicPool<T> extends WorkerAbstract {
-  private pool: DynamicPool;
+export default class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
+  private readonly pool: DynamicThreadPool<WorkerData>;
 
   /**
    * Create a new `WorkerDynamicPool`.
    *
-   * @param {string} workerScript
-   * @param {number} min
-   * @param {number} max
-   * @param {number} workerStartDelay
+   * @param workerScript
+   * @param workerOptions
    */
-  constructor(workerScript: string, min: number, max: number, workerStartDelay?: number) {
-    super(workerScript, workerStartDelay);
-    this.pool = DynamicPool.getInstance(min, max, this.workerScript);
+  constructor(workerScript: string, workerOptions?: WorkerOptions) {
+    super(workerScript, workerOptions);
+    this.workerOptions.poolOptions.exitHandler = this.workerOptions?.poolOptions?.exitHandler ?? WorkerUtils.defaultExitHandler;
+    this.pool = new DynamicThreadPool<WorkerData>(this.workerOptions.poolMinSize, this.workerOptions.poolMaxSize, this.workerScript, this.workerOptions.poolOptions);
   }
 
   get size(): number {
     return this.pool.workers.length;
   }
 
-  get maxElementsPerWorker(): number {
+  get maxElementsPerWorker(): number | null {
     return null;
   }
 
   /**
    *
-   * @returns {Promise<void>}
+   * @returns
    * @public
    */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public async start(): Promise<void> { }
+  public async start(): Promise<void> {
+    // This is intentional
+  }
 
   /**
    *
-   * @returns {Promise<void>}
+   * @returns
    * @public
    */
-  // eslint-disable-next-line @typescript-eslint/require-await
   public async stop(): Promise<void> {
     return this.pool.destroy();
   }
@@ -50,35 +49,12 @@ export default class WorkerDynamicPool<T> extends WorkerAbstract {
   /**
    *
    * @param elementData
-   * @returns {Promise<void>}
+   * @returns
    * @public
    */
-  public async addElement(elementData: T): Promise<void> {
+  public async addElement(elementData: WorkerData): Promise<void> {
     await this.pool.execute(elementData);
-    // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(this.workerStartDelay);
-  }
-}
-
-class DynamicPool extends DynamicThreadPool<WorkerData> {
-  private static instance: DynamicPool;
-
-  private constructor(min: number, max: number, workerScript: string, opts?: PoolOptions<Worker>) {
-    super(min, max, workerScript, opts);
-  }
-
-  public static getInstance(min: number, max: number, workerScript: string): DynamicPool {
-    if (!DynamicPool.instance) {
-      DynamicPool.instance = new DynamicPool(min, max, workerScript,
-        {
-          exitHandler: (code) => {
-            if (code !== 0) {
-              console.error(`Worker stopped with exit code ${code}`);
-            }
-          }
-        }
-      );
-    }
-    return DynamicPool.instance;
+    // Start element sequentially to optimize memory at startup
+    this.workerOptions.elementStartDelay > 0 && await Utils.sleep(this.workerOptions.elementStartDelay);
   }
 }