Add some sanity checks to Wrk class.

[e-mobility-charging-stations-simulator.git] / src / start.ts

diff --git a/src/start.ts b/src/start.ts
index fb58c2d28ca2187dbcf0bb48b8e5b4905f23c512..1baea43212e7668446ec068a83d55fe1f8e0920f 100644 (file)
--- a/src/start.ts
+++ b/src/start.ts
@@ -1,43 +1,49 @@
 import Configuration from './utils/Configuration';
-import { StationTemplateURL } from './types/ConfigurationData';
+import Constants from './utils/Constants';
 import Utils from './utils/Utils';
-import Wrk from './charging-station/Worker';
 import WorkerData from './types/WorkerData';
-import fs from 'fs';
+import Wrk from './charging-station/Worker';
 
 class Bootstrap {
   static async start() {
     try {
       let numStationsTotal = 0;
       let numConcurrentWorkers = 0;
+      const chargingStationsPerWorker = Configuration.getChargingStationsPerWorker();
+      let chargingStationsPerWorkerCounter = 0;
       let worker: Wrk;
-      let chargingStationsPerWorker = Configuration.getChargingStationsPerWorker();
-      let counter = 0;
       // Start each ChargingStation object in a worker thread
       if (Configuration.getStationTemplateURLs()) {
-        for await (const stationURL of Configuration.getStationTemplateURLs()) {
+        for (const stationURL of Configuration.getStationTemplateURLs()) {
           try {
             const nbStations = stationURL.numberOfStations ? stationURL.numberOfStations : 0;
-            numStationsTotal += nbStations;
             for (let index = 1; index <= nbStations; index++) {
               const workerData = {
                 index,
                 templateFile: stationURL.file
               } as WorkerData;
-              if(counter === 0 || counter === chargingStationsPerWorker) {
-                // Start new worker with one charging station
-                worker = await new Wrk('./dist/charging-station/StationWorker.js', workerData, numStationsTotal);
-                worker.start().catch(() => {});
-                counter = 0;
-                // Start workers sequentially to optimize memory at start time
-                await Utils.sleep(500);
-              } else {
-                // Add new charging station to existing Worker
-                worker.startNewChargingStation(workerData, numStationsTotal)
+              if (Configuration.useWorkerPool()) {
+                worker = new Wrk('./dist/charging-station/StationWorker.js', workerData);
+                worker.start().catch(() => { });
+                numConcurrentWorkers = worker.getWorkerPoolSize();
+                numStationsTotal = numConcurrentWorkers;
+                // Start Wrk sequentially to optimize memory at start time
+                await Utils.sleep(Constants.START_WORKER_DELAY);
+              } else if (!Configuration.useWorkerPool() && (chargingStationsPerWorkerCounter === 0 || chargingStationsPerWorkerCounter >= chargingStationsPerWorker)) {
+                // Start new Wrk with one charging station
+                worker = new Wrk('./dist/charging-station/StationWorker.js', workerData, chargingStationsPerWorker);
+                worker.start().catch(() => { });
+                numConcurrentWorkers++;
+                chargingStationsPerWorkerCounter = 1;
+                numStationsTotal++;
+                // Start Wrk sequentially to optimize memory at start time
+                await Utils.sleep(Constants.START_WORKER_DELAY);
+              } else if (!Configuration.useWorkerPool()) {
+                // Add charging station to existing Wrk
+                worker.addWorkerElement(workerData);
+                chargingStationsPerWorkerCounter++;
+                numStationsTotal++;
               }
-              counter++;
-              // Start charging station sequentially to optimize memory at start time
-              numConcurrentWorkers = worker.concurrentWorkers;
             }
           } catch (error) {
             // eslint-disable-next-line no-console
@@ -49,8 +55,10 @@ class Bootstrap {
       }
       if (numStationsTotal === 0) {
         console.log('No charging station template enabled in configuration, exiting');
+      } else if (Configuration.useWorkerPool()) {
+        console.log('Charging station simulator started with ' + numStationsTotal.toString() + ' charging station(s) and ' + numConcurrentWorkers.toString() + '/' + Configuration.getWorkerPoolMaxSize().toString() + ' worker(s) concurrently running');
       } else {
-        console.log('Charging station simulator started with ' + numStationsTotal.toString() + ' charging station(s) of ' + numConcurrentWorkers.toString() + ' concurrently running');
+        console.log('Charging station simulator started with ' + numStationsTotal.toString() + ' charging station(s) and ' + numConcurrentWorkers.toString() + ' worker(s) concurrently running');
       }
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -59,4 +67,8 @@ class Bootstrap {
   }
 }
 
-Bootstrap.start();
+Bootstrap.start().catch(
+  (error) => {
+    console.error(error);
+  }
+);