X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=f081b3c3018ae0f144001b3138e355fbff52e159;hb=107efcc6655b5a4409fc5db3da90869d6881a195;hp=570e5d1bcb2bded02486202787a876d32f251d88;hpb=1e924543e08745cfa9642dca53d303390d391f00;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index 570e5d1b..f081b3c3 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,70 +1,64 @@
-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';
+import { WorkerUtils } from './WorkerUtils';
 
-export default class WorkerDynamicPool extends Wrk {
-  private pool: DynamicPool;
+export default class WorkerDynamicPool<T> extends WorkerAbstract {
+  private pool: DynamicThreadPool<WorkerData>;
 
   /**
    * Create a new `WorkerDynamicPool`.
    *
-   * @param {string} workerScript
+   * @param workerScript
+   * @param min
+   * @param max
+   * @param workerStartDelay
+   * @param opts
    */
-  constructor(workerScript: string, min: number, max: number,) {
-    super(workerScript);
-    this.pool = DynamicPool.getInstance(min, max, this.workerScript);
+  constructor(workerScript: string, min: number, max: number, workerStartDelay?: number, opts?: PoolOptions<Worker>) {
+    super(workerScript, workerStartDelay);
+    opts.exitHandler = opts?.exitHandler ?? WorkerUtils.defaultExitHandler;
+    this.pool = new DynamicThreadPool<WorkerData>(min, max, this.workerScript, opts);
   }
 
   get size(): number {
     return this.pool.workers.length;
   }
 
-  get maxElementsPerWorker(): number {
-    return 1;
+  get maxElementsPerWorker(): number | null {
+    return null;
   }
 
   /**
    *
-   * @return {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
+  }
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns
    * @public
    */
-  public async addElement(elementData: WorkerData): Promise<void> {
-    await this.pool.execute(elementData);
-    // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
-  }
-}
-
-class DynamicPool extends DynamicThreadPool<WorkerData> {
-  private static instance: DynamicPool;
-
-  private constructor(min: number, max: number, filename: string, opts?: DynamicThreadPoolOptions) {
-    super(min, max, filename, opts);
+  public async stop(): Promise<void> {
+    return this.pool.destroy();
   }
 
-  public static getInstance(min: number, max: number, filename: string): DynamicPool {
-    if (!DynamicPool.instance) {
-      DynamicPool.instance = new DynamicPool(min, max, filename,
-        {
-          exitHandler: (code) => {
-            if (code !== 0) {
-              console.error(`Worker stopped with exit code ${code}`);
-            }
-          }
-        }
-      );
-    }
-    return DynamicPool.instance;
+  /**
+   *
+   * @param elementData
+   * @returns
+   * @public
+   */
+  public async addElement(elementData: T): Promise<void> {
+    await this.pool.execute(elementData);
+    // Start worker sequentially to optimize memory at startup
+    await Utils.sleep(this.workerStartDelay);
   }
 }