X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=419243fe7536b48a6087767ab9d01df9321d1fc6;hb=920c567fecd8ca4681c98de6701bab66271b5c05;hp=2151eff9ceb51db91d6662957694f09b1c81c921;hpb=a4624c96a6c159b4885f5d0baaf592ceec0bab30;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 2151eff9..419243fe 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,13 +1,13 @@
-import { Worker, threadId } from 'worker_threads';
-import { WorkerData, WorkerEvents, WorkerSetElement } from '../types/Worker';
+import { WorkerEvents, WorkerSetElement } from '../types/Worker';
 
 import Constants from '../utils/Constants';
 import Utils from '../utils/Utils';
-import Wrk from './Wrk';
+import { Worker } from 'worker_threads';
+import WorkerAbstract from './WorkerAbstract';
 
-export default class WorkerSet extends Wrk {
+export default class WorkerSet<T> extends WorkerAbstract {
   public maxElementsPerWorker: number;
-  private workers: Set<WorkerSetElement>;
+  private workerSet: Set<WorkerSetElement>;
 
   /**
    * Create a new `WorkerSet`.
@@ -17,12 +17,12 @@ export default class WorkerSet extends Wrk {
    */
   constructor(workerScript: string, maxElementsPerWorker = 1) {
     super(workerScript);
-    this.workers = new Set<WorkerSetElement>();
+    this.workerSet = new Set<WorkerSetElement>();
     this.maxElementsPerWorker = maxElementsPerWorker;
   }
 
   get size(): number {
-    return this.workers.size;
+    return this.workerSet.size;
   }
 
   /**
@@ -30,8 +30,8 @@ export default class WorkerSet extends Wrk {
    * @return {Promise<void>}
    * @public
    */
-  public async addElement(elementData: WorkerData): Promise<void> {
-    if (!this.workers) {
+  public async addElement(elementData: T): Promise<void> {
+    if (!this.workerSet) {
       throw Error('Cannot add a WorkerSet element: workers\' set does not exist');
     }
     if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
@@ -54,6 +54,18 @@ export default class WorkerSet extends Wrk {
     await Utils.sleep(Constants.START_WORKER_DELAY);
   }
 
+  /**
+   *
+   * @return {Promise<void>}
+   * @public
+   */
+  public async stop(): Promise<void> {
+    for (const workerSetElement of this.workerSet) {
+      await workerSetElement.worker.terminate();
+    }
+    this.workerSet.clear();
+  }
+
   /**
    *
    * @return {Promise}
@@ -65,20 +77,31 @@ export default class WorkerSet extends Wrk {
     worker.on('error', () => { });
     worker.on('exit', (code) => {
       if (code !== 0) {
-        console.error(`Worker ${threadId} stopped with exit code ${code}`);
+        console.error(`Worker stopped with exit code ${code}`);
       }
+      this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
     });
-    this.workers.add({ worker, numberOfWorkerElements: 0 });
+    this.workerSet.add({ worker, numberOfWorkerElements: 0 });
   }
 
   private getLastWorkerSetElement(): WorkerSetElement {
     let workerSetElement: WorkerSetElement;
     // eslint-disable-next-line no-empty
-    for (workerSetElement of this.workers) { }
+    for (workerSetElement of this.workerSet) { }
     return workerSetElement;
   }
 
   private getLastWorker(): Worker {
     return this.getLastWorkerSetElement().worker;
   }
+
+  private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
+    let workerSetElt: WorkerSetElement;
+    this.workerSet.forEach((workerSetElement) => {
+      if (JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)) {
+        workerSetElt = workerSetElement;
+      }
+    });
+    return workerSetElt;
+  }
 }