X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=e1fce2e62058a8ee6c5750a7e01a2d48891c164b;hb=789871d6585093e2ab0444bd7ca063ca86c344f8;hp=eaa19ac8f384ed5ce591362696e13bfdf765ab5a;hpb=721646e902fa12d165d4a1da06fb963fb30dc9f2;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts index eaa19ac8..e1fce2e6 100644 --- a/src/worker/WorkerSet.ts +++ b/src/worker/WorkerSet.ts @@ -11,7 +11,7 @@ import { type WorkerOptions, type WorkerSetElement, } from './WorkerTypes'; -import { WorkerUtils } from './WorkerUtils'; +import { defaultErrorHandler, defaultExitHandler, sleep } from './WorkerUtils'; export class WorkerSet extends WorkerAbstract { private readonly workerSet: Set; @@ -55,10 +55,10 @@ export class WorkerSet extends WorkerAbstract { id: WorkerMessageEvents.startWorkerElement, data: elementData, }); - this.getLastWorkerSetElement().numberOfWorkerElements++; + ++this.getLastWorkerSetElement().numberOfWorkerElements; // Start element sequentially to optimize memory at startup if (this.workerOptions.elementStartDelay > 0) { - await WorkerUtils.sleep(this.workerOptions.elementStartDelay); + await sleep(this.workerOptions.elementStartDelay); } } @@ -94,15 +94,14 @@ export class WorkerSet extends WorkerAbstract { this ) as MessageHandler ); - worker.on('error', WorkerUtils.defaultErrorHandler.bind(this) as (err: Error) => void); + worker.on('error', defaultErrorHandler.bind(this) as (err: Error) => void); worker.on('exit', (code) => { - WorkerUtils.defaultExitHandler(code); + defaultExitHandler(code); this.workerSet.delete(this.getWorkerSetElementByWorker(worker)); }); this.workerSet.add({ worker, numberOfWorkerElements: 0 }); // Start worker sequentially to optimize memory at startup - this.workerOptions.workerStartDelay > 0 && - (await WorkerUtils.sleep(this.workerOptions.workerStartDelay)); + this.workerOptions.workerStartDelay > 0 && (await sleep(this.workerOptions.workerStartDelay)); } private getLastWorkerSetElement(): WorkerSetElement {