X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=dd12fdb5a59ee1f118a5a6b2016451d2ea1f735b;hb=2541c612bf17b3c2dd3b7cf3c9663c546bd84aaf;hp=6ea0a05964d2af13370c23c0dbb7b60ae0246775;hpb=05745045efc825738ba9ba4b30d4d4ec932a5dd3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 6ea0a059..dd12fdb5 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,11 +1,10 @@
 import { WorkerEvents, WorkerSetElement } from '../types/Worker';
 
-import Constants from '../utils/Constants';
 import Utils from '../utils/Utils';
 import { Worker } from 'worker_threads';
-import Wrk from './Wrk';
+import WorkerAbstract from './WorkerAbstract';
 
-export default class WorkerSet<T> extends Wrk {
+export default class WorkerSet<T> extends WorkerAbstract {
   public maxElementsPerWorker: number;
   private workerSet: Set<WorkerSetElement>;
 
@@ -14,9 +13,10 @@ export default class WorkerSet<T> extends Wrk {
    *
    * @param {string} workerScript
    * @param {number} maxElementsPerWorker
+   * @param {number} workerStartDelay
    */
-  constructor(workerScript: string, maxElementsPerWorker = 1) {
-    super(workerScript);
+  constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number) {
+    super(workerScript, workerStartDelay);
     this.workerSet = new Set<WorkerSetElement>();
     this.maxElementsPerWorker = maxElementsPerWorker;
   }
@@ -27,7 +27,8 @@ export default class WorkerSet<T> extends Wrk {
 
   /**
    *
-   * @return {Promise<void>}
+   * @param elementData
+   * @returns {Promise<void>}
    * @public
    */
   public async addElement(elementData: T): Promise<void> {
@@ -37,7 +38,7 @@ export default class WorkerSet<T> extends Wrk {
     if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
       this.startWorker();
       // Start worker sequentially to optimize memory at startup
-      await Utils.sleep(Constants.START_WORKER_DELAY);
+      await Utils.sleep(this.workerStartDelay);
     }
     this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT, workerData: elementData });
     this.getLastWorkerSetElement().numberOfWorkerElements++;
@@ -45,18 +46,18 @@ export default class WorkerSet<T> extends Wrk {
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    * @public
    */
   public async start(): Promise<void> {
     this.startWorker();
     // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
+    await Utils.sleep(this.workerStartDelay);
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    * @public
    */
   public async stop(): Promise<void> {
@@ -68,7 +69,6 @@ export default class WorkerSet<T> extends Wrk {
 
   /**
    *
-   * @return {Promise}
    * @private
    */
   private startWorker(): void {
@@ -98,7 +98,7 @@ export default class WorkerSet<T> extends Wrk {
   private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
     let workerSetElt: WorkerSetElement;
     this.workerSet.forEach((workerSetElement) => {
-      if (JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)) {
+      if (workerSetElement.worker.threadId === worker.threadId) {
         workerSetElt = workerSetElement;
       }
     });