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
build(deps): apply updates
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index b76af5df2d5a2c274de00db35c3d593ee628d846..d066ce9e7ffb818d6e4190c4ce158a51fdaa9da5 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-1,6
+1,6
@@
// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
-import
EventEmitterAsyncResource
from 'node:events';
+import
{ EventEmitter }
from 'node:events';
import { SHARE_ENV, Worker } from 'node:worker_threads';
import { WorkerAbstract } from './WorkerAbstract';
import { SHARE_ENV, Worker } from 'node:worker_threads';
import { WorkerAbstract } from './WorkerAbstract';
@@
-16,7
+16,7
@@
import {
import { sleep } from './WorkerUtils';
export class WorkerSet extends WorkerAbstract<WorkerData> {
import { sleep } from './WorkerUtils';
export class WorkerSet extends WorkerAbstract<WorkerData> {
- public readonly emitter: EventEmitter
AsyncResource
;
+ public readonly emitter: EventEmitter;
private readonly workerSet: Set<WorkerSetElement>;
/**
private readonly workerSet: Set<WorkerSetElement>;
/**
@@
-36,18
+36,19
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
};
this.workerSet = new Set<WorkerSetElement>();
if (this.workerOptions?.poolOptions?.enableEvents) {
};
this.workerSet = new Set<WorkerSetElement>();
if (this.workerOptions?.poolOptions?.enableEvents) {
- this.emitter = new EventEmitter
AsyncResource
();
+ this.emitter = new EventEmitter();
}
}
get info(): SetInfo {
return {
}
}
get info(): SetInfo {
return {
+ version: WorkerConstants.version,
type: 'set',
worker: 'thread',
size: this.size,
elementsExecuting: [...this.workerSet].reduce(
(accumulator, workerSetElement) => accumulator + workerSetElement.numberOfWorkerElements,
type: 'set',
worker: 'thread',
size: this.size,
elementsExecuting: [...this.workerSet].reduce(
(accumulator, workerSetElement) => accumulator + workerSetElement.numberOfWorkerElements,
- 0
+ 0
,
),
elementsPerWorker: this.maxElementsPerWorker,
};
),
elementsPerWorker: this.maxElementsPerWorker,
};
@@
-71,7
+72,13
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
/** @inheritDoc */
public async stop(): Promise<void> {
for (const workerSetElement of this.workerSet) {
/** @inheritDoc */
public async stop(): Promise<void> {
for (const workerSetElement of this.workerSet) {
+ const workerExitPromise = new Promise<void>((resolve) => {
+ workerSetElement.worker.on('exit', () => {
+ resolve();
+ });
+ });
await workerSetElement.worker.terminate();
await workerSetElement.worker.terminate();
+ await workerExitPromise;
}
this.workerSet.clear();
}
}
this.workerSet.clear();
}
@@
-103,34
+110,38
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
});
worker.on(
'message',
});
worker.on(
'message',
- this.workerOptions?.poolOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions?.poolOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION
,
);
worker.on(
'error',
);
worker.on(
'error',
- this.workerOptions?.poolOptions?.errorHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions?.poolOptions?.errorHandler ?? WorkerConstants.EMPTY_FUNCTION
,
);
worker.on('error', (error) => {
);
worker.on('error', (error) => {
- if (this.emitter !== undefined) {
- this.emitter.emit(WorkerSetEvents.error, error);
- }
+ this.emitter?.emit(WorkerSetEvents.error, error);
if (this.workerOptions?.poolOptions?.restartWorkerOnError) {
this.addWorkerSetElement();
}
});
worker.on(
'online',
if (this.workerOptions?.poolOptions?.restartWorkerOnError) {
this.addWorkerSetElement();
}
});
worker.on(
'online',
- this.workerOptions?.poolOptions?.onlineHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions?.poolOptions?.onlineHandler ?? WorkerConstants.EMPTY_FUNCTION
,
);
worker.on(
'exit',
);
worker.on(
'exit',
- this.workerOptions?.poolOptions?.exitHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions?.poolOptions?.exitHandler ?? WorkerConstants.EMPTY_FUNCTION,
+ );
+ worker.once('exit', () =>
+ this.removeWorkerSetElement(this.getWorkerSetElementByWorker(worker)),
);
);
- worker.once('exit', () => this.workerSet.delete(this.getWorkerSetElementByWorker(worker)));
const workerSetElement: WorkerSetElement = { worker, numberOfWorkerElements: 0 };
this.workerSet.add(workerSetElement);
return workerSetElement;
}
const workerSetElement: WorkerSetElement = { worker, numberOfWorkerElements: 0 };
this.workerSet.add(workerSetElement);
return workerSetElement;
}
+ private removeWorkerSetElement(workerSetElement: WorkerSetElement): void {
+ this.workerSet.delete(workerSetElement);
+ }
+
private async getWorkerSetElement(): Promise<WorkerSetElement> {
let chosenWorkerSetElement: WorkerSetElement;
for (const workerSetElement of this.workerSet) {
private async getWorkerSetElement(): Promise<WorkerSetElement> {
let chosenWorkerSetElement: WorkerSetElement;
for (const workerSetElement of this.workerSet) {