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
README.md: refinement
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index bda3018bf9a2df631dd9057dc6647844ebbf03f3..dd12fdb5a59ee1f118a5a6b2016451d2ea1f735b 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-1,6
+1,5
@@
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';
@@
-14,9
+13,10
@@
export default class WorkerSet<T> extends WorkerAbstract {
*
* @param {string} workerScript
* @param {number} maxElementsPerWorker
*
* @param {string} workerScript
* @param {number} maxElementsPerWorker
+ * @param {number} workerStartDelay
*/
*/
- constructor(workerScript: string, maxElementsPerWorker = 1) {
- super(workerScript);
+ constructor(workerScript: string, maxElementsPerWorker = 1
, workerStartDelay?: number
) {
+ super(workerScript
, workerStartDelay
);
this.workerSet = new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
}
this.workerSet = new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
}
@@
-38,7
+38,7
@@
export default class WorkerSet<T> extends WorkerAbstract {
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, workerData: elementData });
this.getLastWorkerSetElement().numberOfWorkerElements++;
}
this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT, workerData: elementData });
this.getLastWorkerSetElement().numberOfWorkerElements++;
@@
-52,7
+52,7
@@
export default class WorkerSet<T> extends WorkerAbstract {
public async start(): Promise<void> {
this.startWorker();
// Start worker sequentially to optimize memory at startup
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
);
}
/**
}
/**
@@
-69,7
+69,6
@@
export default class WorkerSet<T> extends WorkerAbstract {
/**
*
/**
*
- * @returns {Promise}
* @private
*/
private startWorker(): void {
* @private
*/
private startWorker(): void {
@@
-99,7
+98,7
@@
export default class WorkerSet<T> extends WorkerAbstract {
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
this.workerSet.forEach((workerSetElement) => {
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
this.workerSet.forEach((workerSetElement) => {
- if (
JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)
) {
+ if (
workerSetElement.worker.threadId === worker.threadId
) {
workerSetElt = workerSetElement;
}
});
workerSetElt = workerSetElement;
}
});