X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerStaticPool.ts;h=23112a6c566ff0b95f6f07cf48b606332ab1b7fd;hb=4195af92661fd070e60b579f7b7308d93bf11e7a;hp=1cbd18e8b9b1cf89094350c71ac2b1488d2d0aac;hpb=c3ee95af4edd541595e3873c8aa4c93d38e59474;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerStaticPool.ts b/src/worker/WorkerStaticPool.ts
index 1cbd18e8..23112a6c 100644
--- a/src/worker/WorkerStaticPool.ts
+++ b/src/worker/WorkerStaticPool.ts
@@ -1,9 +1,8 @@
-import { FixedThreadPool, PoolOptions } from 'poolifier';
+import { FixedThreadPool } from 'poolifier';
 
+import type { WorkerData, WorkerOptions } from '../types/Worker';
 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 WorkerStaticPool extends WorkerAbstract<WorkerData> {
@@ -13,14 +12,19 @@ export default class WorkerStaticPool extends WorkerAbstract<WorkerData> {
    * Create a new `WorkerStaticPool`.
    *
    * @param workerScript
-   * @param numberOfThreads
-   * @param startWorkerDelay
-   * @param opts
+   * @param workerOptions
    */
-  constructor(workerScript: string, numberOfThreads: number, startWorkerDelay?: number, opts?: PoolOptions<Worker>) {
-    super(workerScript, startWorkerDelay);
-    opts.exitHandler = opts?.exitHandler ?? WorkerUtils.defaultExitHandler;
-    this.pool = new FixedThreadPool(numberOfThreads, this.workerScript, opts);
+  constructor(workerScript: string, workerOptions?: WorkerOptions) {
+    super(workerScript, workerOptions);
+    this.workerOptions.poolOptions.errorHandler =
+      this.workerOptions?.poolOptions?.errorHandler ?? WorkerUtils.defaultErrorHandler;
+    this.workerOptions.poolOptions.exitHandler =
+      this.workerOptions?.poolOptions?.exitHandler ?? WorkerUtils.defaultExitHandler;
+    this.pool = new FixedThreadPool(
+      this.workerOptions.poolMaxSize,
+      this.workerScript,
+      this.workerOptions.poolOptions
+    );
   }
 
   get size(): number {
@@ -57,7 +61,8 @@ export default class WorkerStaticPool extends WorkerAbstract<WorkerData> {
    */
   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);
+    // Start element sequentially to optimize memory at startup
+    this.workerOptions.elementStartDelay > 0 &&
+      (await Utils.sleep(this.workerOptions.elementStartDelay));
   }
 }