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
.gitmodules: indentation fixlet.
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index 0c59c09108089d059184bcaac99e6ffc104c3341..419243fe7536b48a6087767ab9d01df9321d1fc6 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-1,13
+1,13
@@
-import { Worker
Data, Worker
Events, 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 Constants from '../utils/Constants';
import Utils from '../utils/Utils';
import { Worker } from 'worker_threads';
-import W
rk from './Wrk
';
+import W
orkerAbstract from './WorkerAbstract
';
-export default class WorkerSet
extends Wrk
{
+export default class WorkerSet
<T> extends WorkerAbstract
{
public maxElementsPerWorker: number;
public maxElementsPerWorker: number;
- private worker
s
: Set<WorkerSetElement>;
+ private worker
Set
: Set<WorkerSetElement>;
/**
* Create a new `WorkerSet`.
/**
* Create a new `WorkerSet`.
@@
-17,12
+17,12
@@
export default class WorkerSet extends Wrk {
*/
constructor(workerScript: string, maxElementsPerWorker = 1) {
super(workerScript);
*/
constructor(workerScript: string, maxElementsPerWorker = 1) {
super(workerScript);
- this.worker
s
= new Set<WorkerSetElement>();
+ this.worker
Set
= new Set<WorkerSetElement>();
this.maxElementsPerWorker = maxElementsPerWorker;
}
get size(): number {
this.maxElementsPerWorker = maxElementsPerWorker;
}
get size(): number {
- return this.worker
s
.size;
+ return this.worker
Set
.size;
}
/**
}
/**
@@
-30,8
+30,8
@@
export default class WorkerSet extends Wrk {
* @return {Promise<void>}
* @public
*/
* @return {Promise<void>}
* @public
*/
- public async addElement(elementData:
WorkerData
): Promise<void> {
- if (!this.worker
s
) {
+ public async addElement(elementData:
T
): Promise<void> {
+ if (!this.worker
Set
) {
throw Error('Cannot add a WorkerSet element: workers\' set does not exist');
}
if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
throw Error('Cannot add a WorkerSet element: workers\' set does not exist');
}
if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
@@
-54,6
+54,18
@@
export default class WorkerSet extends Wrk {
await Utils.sleep(Constants.START_WORKER_DELAY);
}
await Utils.sleep(Constants.START_WORKER_DELAY);
}
+ /**
+ *
+ * @return {Promise<void>}
+ * @public
+ */
+ public async stop(): Promise<void> {
+ for (const workerSetElement of this.workerSet) {
+ await workerSetElement.worker.terminate();
+ }
+ this.workerSet.clear();
+ }
+
/**
*
* @return {Promise}
/**
*
* @return {Promise}
@@
-67,15
+79,15
@@
export default class WorkerSet extends Wrk {
if (code !== 0) {
console.error(`Worker stopped with exit code ${code}`);
}
if (code !== 0) {
console.error(`Worker stopped with exit code ${code}`);
}
- // FIXME: remove matching worker set element
+ this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
});
});
- this.worker
s
.add({ worker, numberOfWorkerElements: 0 });
+ this.worker
Set
.add({ worker, numberOfWorkerElements: 0 });
}
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.worker
s
) { }
+ for (workerSetElement of this.worker
Set
) { }
return workerSetElement;
}
return workerSetElement;
}
@@
-85,7
+97,7
@@
export default class WorkerSet extends Wrk {
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
let workerSetElt: WorkerSetElement;
- this.worker
s
.forEach((workerSetElement) => {
+ this.worker
Set
.forEach((workerSetElement) => {
if (JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)) {
workerSetElt = workerSetElement;
}
if (JSON.stringify(workerSetElement.worker) === JSON.stringify(worker)) {
workerSetElt = workerSetElement;
}