repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup CF and docker deployment support
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index 2ccd27961941ac5c56eb3ddb1a463138dea21495..ae99da5b4a319093bd4923913a173d3a2a1eb040 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-1,24
+1,30
@@
-import { WorkerEvents, WorkerSetElement } from '../types/Worker';
+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
+import { WorkerMessageEvents, WorkerOptions, WorkerSetElement } from '../types/Worker';
import Utils from '../utils/Utils';
import { Worker } from 'worker_threads';
import WorkerAbstract from './WorkerAbstract';
import Utils from '../utils/Utils';
import { Worker } from 'worker_threads';
import WorkerAbstract from './WorkerAbstract';
+import { WorkerUtils } from './WorkerUtils';
export default class WorkerSet<T> extends WorkerAbstract {
export default class WorkerSet<T> extends WorkerAbstract {
- public maxElementsPerWorker: number;
+ public readonly maxElementsPerWorker: number;
+ private readonly messageHandler: (message: unknown) => void | Promise<void>;
private workerSet: Set<WorkerSetElement>;
/**
* Create a new `WorkerSet`.
*
private workerSet: Set<WorkerSetElement>;
/**
* Create a new `WorkerSet`.
*
- * @param {string} workerScript
- * @param {number} maxElementsPerWorker
- * @param {number} workerStartDelay
+ * @param workerScript
+ * @param maxElementsPerWorker
+ * @param workerStartDelay
+ * @param opts
*/
*/
- constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number) {
+ constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number
, opts?: WorkerOptions
) {
super(workerScript, workerStartDelay);
super(workerScript, workerStartDelay);
- this.workerSet = new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
this.maxElementsPerWorker = maxElementsPerWorker;
+ this.messageHandler = opts?.messageHandler ?? (() => { });
+ this.workerSet = new Set<WorkerSetElement>();
}
get size(): number {
}
get size(): number {
@@
-27,8
+33,8
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
*
/**
*
- * @param
{T}
elementData
- * @returns
{Promise<void>}
+ * @param elementData
+ * @returns
* @public
*/
public async addElement(elementData: T): Promise<void> {
* @public
*/
public async addElement(elementData: T): Promise<void> {
@@
-40,13
+46,13
@@
export default class WorkerSet<T> extends WorkerAbstract {
// Start worker sequentially to optimize memory at startup
await Utils.sleep(this.workerStartDelay);
}
// Start worker sequentially to optimize memory at startup
await Utils.sleep(this.workerStartDelay);
}
- this.getLastWorker().postMessage({ id: Worker
Events.START_WORKER_ELEMENT, workerD
ata: elementData });
+ this.getLastWorker().postMessage({ id: Worker
MessageEvents.START_WORKER_ELEMENT, d
ata: elementData });
this.getLastWorkerSetElement().numberOfWorkerElements++;
}
/**
*
this.getLastWorkerSetElement().numberOfWorkerElements++;
}
/**
*
- * @returns
{Promise<void>}
+ * @returns
* @public
*/
public async start(): Promise<void> {
* @public
*/
public async start(): Promise<void> {
@@
-57,7
+63,7
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
*
/**
*
- * @returns
{Promise<void>}
+ * @returns
* @public
*/
public async stop(): Promise<void> {
* @public
*/
public async stop(): Promise<void> {
@@
-73,12
+79,14
@@
export default class WorkerSet<T> extends WorkerAbstract {
*/
private startWorker(): void {
const worker = new Worker(this.workerScript);
*/
private startWorker(): void {
const worker = new Worker(this.workerScript);
- worker.on('message', () => { });
- worker.on('error', () => { });
+ worker.on('message', (msg) => {
+ (async () => {
+ await this.messageHandler(msg);
+ })().catch(() => {});
+ });
+ worker.on('error', () => { /* This is intentional */ });
worker.on('exit', (code) => {
worker.on('exit', (code) => {
- if (code !== 0) {
- console.error(`Worker stopped with exit code ${code}`);
- }
+ WorkerUtils.defaultExitHandler(code);
this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
});
this.workerSet.add({ worker, numberOfWorkerElements: 0 });
this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
});
this.workerSet.add({ worker, numberOfWorkerElements: 0 });
@@
-87,7
+95,7
@@
export default class WorkerSet<T> extends WorkerAbstract {
private getLastWorkerSetElement(): WorkerSetElement {
let workerSetElement: WorkerSetElement;
// eslint-disable-next-line no-empty
private getLastWorkerSetElement(): WorkerSetElement {
let workerSetElement: WorkerSetElement;
// eslint-disable-next-line no-empty
- for (workerSetElement of this.workerSet) { }
+ for (workerSetElement of this.workerSet) {
/* This is intentional */
}
return workerSetElement;
}
return workerSetElement;
}
@@
-97,11
+105,12
@@
export default class WorkerSet<T> extends WorkerAbstract {
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
-
this.workerSet.forEach((workerSetElement) =>
{
+
for (const workerSetElement of this.workerSet)
{
if (workerSetElement.worker.threadId === worker.threadId) {
workerSetElt = workerSetElement;
if (workerSetElement.worker.threadId === worker.threadId) {
workerSetElt = workerSetElement;
+ break;
}
}
- }
);
+ }
return workerSetElt;
}
}
return workerSetElt;
}
}