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

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 50b99f02..dd12fdb5 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,84 +1,107 @@
-import Constants from '../utils/Constants';
+import { WorkerEvents, WorkerSetElement } from '../types/Worker';
+
 import Utils from '../utils/Utils';
 import { Worker } from 'worker_threads';
-import WorkerData from '../types/WorkerData';
-import Wrk from './Wrk';
+import WorkerAbstract from './WorkerAbstract';
 
-export default class WorkerSet extends Wrk {
+export default class WorkerSet<T> extends WorkerAbstract {
   public maxElementsPerWorker: number;
-  private workers: Set<Worker>;
-  private lastWorkerNumberOfElements: number;
+  private workerSet: Set<WorkerSetElement>;
 
   /**
    * Create a new `WorkerSet`.
    *
    * @param {string} workerScript
    * @param {number} maxElementsPerWorker
+   * @param {number} workerStartDelay
    */
-  constructor(workerScript: string, maxElementsPerWorker = 1) {
-    super(workerScript);
-    this.workers = new Set<Worker>();
+  constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number) {
+    super(workerScript, workerStartDelay);
+    this.workerSet = new Set<WorkerSetElement>();
     this.maxElementsPerWorker = maxElementsPerWorker;
-    this.lastWorkerNumberOfElements = 0;
   }
 
   get size(): number {
-    return this.workers.size;
+    return this.workerSet.size;
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @param elementData
+   * @returns {Promise<void>}
    * @public
    */
-  public async addElement(elementData: WorkerData): Promise<void> {
-    if (!this.workers) {
-      throw Error('Cannot add a WorkerSet element: workers set does not exist');
+  public async addElement(elementData: T): Promise<void> {
+    if (!this.workerSet) {
+      throw Error('Cannot add a WorkerSet element: workers\' set does not exist');
     }
-    if (this.lastWorkerNumberOfElements >= this.maxElementsPerWorker) {
-      void this.startWorker();
-      this.lastWorkerNumberOfElements = 0;
+    if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
+      this.startWorker();
       // Start worker sequentially to optimize memory at startup
-      void Utils.sleep(Constants.START_WORKER_DELAY);
+      await Utils.sleep(this.workerStartDelay);
     }
-    this.getLastWorker().postMessage({ id: Constants.START_WORKER_ELEMENT, workerData: elementData });
-    this.lastWorkerNumberOfElements++;
+    this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT, workerData: elementData });
+    this.getLastWorkerSetElement().numberOfWorkerElements++;
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    * @public
    */
   public async start(): Promise<void> {
-    await this.startWorker();
+    this.startWorker();
     // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
+    await Utils.sleep(this.workerStartDelay);
+  }
+
+  /**
+   *
+   * @returns {Promise<void>}
+   * @public
+   */
+  public async stop(): Promise<void> {
+    for (const workerSetElement of this.workerSet) {
+      await workerSetElement.worker.terminate();
+    }
+    this.workerSet.clear();
   }
 
   /**
    *
-   * @return {Promise}
    * @private
    */
-  private async startWorker() {
-    return new Promise((resolve, reject) => {
-      const worker = new Worker(this.workerScript);
-      worker.on('message', resolve);
-      worker.on('error', reject);
-      worker.on('exit', (code) => {
-        if (code !== 0) {
-          reject(new Error(`Worker stopped with exit code ${code}`));
-        }
-      });
-      this.workers.add(worker);
+  private startWorker(): void {
+    const worker = new Worker(this.workerScript);
+    worker.on('message', () => { });
+    worker.on('error', () => { });
+    worker.on('exit', (code) => {
+      if (code !== 0) {
+        console.error(`Worker stopped with exit code ${code}`);
+      }
+      this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
     });
+    this.workerSet.add({ worker, numberOfWorkerElements: 0 });
   }
 
-  private getLastWorker(): Worker {
-    let worker: Worker;
+  private getLastWorkerSetElement(): WorkerSetElement {
+    let workerSetElement: WorkerSetElement;
     // eslint-disable-next-line no-empty
-    for (worker of this.workers) { }
-    return worker;
+    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 (workerSetElement.worker.threadId === worker.threadId) {
+        workerSetElt = workerSetElement;
+      }
+    });
+    return workerSetElt;
   }
 }