X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=cf22c0a8e865587166ec362431474c693f41e7c8;hb=aeada1fa7a7ab2d443cb1af7585a4ec506bad6bd;hp=aa3542b26386f72e75c39eb589656e3f9009e1ca;hpb=1af50fac1ab71fed19f11864d1644261046698a3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index aa3542b2..cf22c0a8 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,20 +1,23 @@
-import { DynamicThreadPool, DynamicThreadPoolOptions } from 'poolifier';
+import { DynamicThreadPool, PoolOptions } from 'poolifier';
 
-import Constants from '../utils/Constants';
 import Utils from '../utils/Utils';
+import { Worker } from 'worker_threads';
+import WorkerAbstract from './WorkerAbstract';
 import { WorkerData } from '../types/Worker';
-import Wrk from './Wrk';
 
-export default class WorkerDynamicPool<T> extends Wrk {
+export default class WorkerDynamicPool<T> extends WorkerAbstract {
   private pool: DynamicPool;
 
   /**
    * Create a new `WorkerDynamicPool`.
    *
    * @param {string} workerScript
+   * @param {number} min
+   * @param {number} max
+   * @param {number} workerStartDelay
    */
-  constructor(workerScript: string, min: number, max: number,) {
-    super(workerScript);
+  constructor(workerScript: string, min: number, max: number, workerStartDelay?: number) {
+    super(workerScript, workerStartDelay);
     this.pool = DynamicPool.getInstance(min, max, this.workerScript);
   }
 
@@ -23,12 +26,12 @@ export default class WorkerDynamicPool<T> extends Wrk {
   }
 
   get maxElementsPerWorker(): number {
-    return 1;
+    return null;
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    * @public
    */
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -36,35 +39,37 @@ export default class WorkerDynamicPool<T> extends Wrk {
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    * @public
    */
+  // eslint-disable-next-line @typescript-eslint/require-await
   public async stop(): Promise<void> {
     return this.pool.destroy();
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @param elementData
+   * @returns {Promise<void>}
    * @public
    */
   public async addElement(elementData: T): Promise<void> {
     await this.pool.execute(elementData);
     // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
+    await Utils.sleep(this.workerStartDelay);
   }
 }
 
 class DynamicPool extends DynamicThreadPool<WorkerData> {
   private static instance: DynamicPool;
 
-  private constructor(min: number, max: number, filename: string, opts?: DynamicThreadPoolOptions) {
-    super(min, max, filename, opts);
+  private constructor(min: number, max: number, workerScript: string, opts?: PoolOptions<Worker>) {
+    super(min, max, workerScript, opts);
   }
 
-  public static getInstance(min: number, max: number, filename: string): DynamicPool {
+  public static getInstance(min: number, max: number, workerScript: string): DynamicPool {
     if (!DynamicPool.instance) {
-      DynamicPool.instance = new DynamicPool(min, max, filename,
+      DynamicPool.instance = new DynamicPool(min, max, workerScript,
         {
           exitHandler: (code) => {
             if (code !== 0) {