Fix worker with pool handling

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

diff --git a/src/start.ts b/src/start.ts
index fb58c2d28ca2187dbcf0bb48b8e5b4905f23c512..3b9fc75b287c7c8d9eff1296dd0eb720ddb09fe0 100644 (file)
--- a/src/start.ts
+++ b/src/start.ts
@@ -1,9 +1,8 @@
 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() {
@@ -11,8 +10,6 @@ class Bootstrap {
       let numStationsTotal = 0;
       let numConcurrentWorkers = 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()) {
@@ -24,20 +21,27 @@ class Bootstrap {
                 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);
+              if (Configuration.useWorkerPool()) {
+                worker = new Wrk('./dist/charging-station/StationWorker.js', workerData);
+                worker.start().catch(() => { });
+                numConcurrentWorkers = Configuration.getWorkerPoolSize();
               } else {
-                // Add new charging station to existing Worker
-                worker.startNewChargingStation(workerData, numStationsTotal)
+                const chargingStationsPerWorker = Configuration.getChargingStationsPerWorker();
+                let chargingStationsPerWorkerCounter = 0;
+                if (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;
+                  // Start Wrk sequentially to optimize memory at start time
+                  await Utils.sleep(Constants.START_WORKER_DELAY);
+                } else {
+                  // Add charging station to existing Wrk
+                  worker.addWorkerElement(workerData);
+                  chargingStationsPerWorkerCounter++;
+                }
               }
-              counter++;
-              // Start charging station sequentially to optimize memory at start time
-              numConcurrentWorkers = worker.concurrentWorkers;
             }
           } catch (error) {
             // eslint-disable-next-line no-console