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
Storage: use worker threads message passing to store performance records from
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index bda3018bf9a2df631dd9057dc6647844ebbf03f3..1b82f1d751a1854d1ed4af9782e4b4b345e71c44 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-1,9
+1,11
@@
+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
import { WorkerEvents, WorkerSetElement } from '../types/Worker';
import { WorkerEvents, WorkerSetElement } from '../types/Worker';
-import Constants from '../utils/Constants';
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 {
public maxElementsPerWorker: number;
export default class WorkerSet<T> extends WorkerAbstract {
public maxElementsPerWorker: number;
@@
-12,11
+14,13
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
* Create a new `WorkerSet`.
*
/**
* Create a new `WorkerSet`.
*
- * @param {string} workerScript
- * @param {number} maxElementsPerWorker
+ * @param workerScript
+ * @param maxElementsPerWorker
+ * @param workerStartDelay
+ * @param messageListenerCallback
*/
*/
- constructor(workerScript: string, maxElementsPerWorker = 1) {
- super(workerScript);
+ constructor(workerScript: string, maxElementsPerWorker = 1
, workerStartDelay?: number, messageListenerCallback: (message: any) => void = () => { /* This is intentional */ }
) {
+ super(workerScript
, workerStartDelay, messageListenerCallback
);
this.workerSet = new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
}
this.workerSet = new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
}
@@
-28,36
+32,36
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
*
* @param elementData
/**
*
* @param elementData
- * @returns
{Promise<void>}
+ * @returns
* @public
*/
public async addElement(elementData: T): Promise<void> {
if (!this.workerSet) {
* @public
*/
public async addElement(elementData: T): Promise<void> {
if (!this.workerSet) {
- throw Error('Cannot add a WorkerSet element: workers\' set does not exist');
+ throw
new
Error('Cannot add a WorkerSet element: workers\' set does not exist');
}
if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
this.startWorker();
// Start worker sequentially to optimize memory at startup
}
if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
this.startWorker();
// Start worker sequentially to optimize memory at startup
- await Utils.sleep(
Constants.START_WORKER_DELAY
);
+ await Utils.sleep(
this.workerStartDelay
);
}
}
- this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT,
workerD
ata: elementData });
+ this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT,
d
ata: elementData });
this.getLastWorkerSetElement().numberOfWorkerElements++;
}
/**
*
this.getLastWorkerSetElement().numberOfWorkerElements++;
}
/**
*
- * @returns
{Promise<void>}
+ * @returns
* @public
*/
public async start(): Promise<void> {
this.startWorker();
// Start worker sequentially to optimize memory at startup
* @public
*/
public async start(): Promise<void> {
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>}
+ * @returns
* @public
*/
public async stop(): Promise<void> {
* @public
*/
public async stop(): Promise<void> {
@@
-69,17
+73,14
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
*
/**
*
- * @returns {Promise}
* @private
*/
private startWorker(): void {
const worker = new Worker(this.workerScript);
* @private
*/
private startWorker(): void {
const worker = new Worker(this.workerScript);
- worker.on('message',
() => { }
);
- worker.on('error', () => { });
+ worker.on('message',
this.messageListener
);
+ 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 });
@@
-88,7
+89,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;
}
@@
-98,11
+99,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) =>
{
- if (
JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)
) {
+
for (const workerSetElement of this.workerSet)
{
+ if (
workerSetElement.worker.threadId === worker.threadId
) {
workerSetElt = workerSetElement;
workerSetElt = workerSetElement;
+ break;
}
}
- }
);
+ }
return workerSetElt;
}
}
return workerSetElt;
}
}