import { Worker, WorkerOptions } from 'worker_threads';
import Configuration from '../utils/Configuration';
+import Constants from '../utils/Constants';
import Pool from 'worker-threads-pool';
import WorkerData from '../types/WorkerData';
-import Constants from '../utils/Constants';
export default class Wrk {
private _workerScript: string;
private _workerData: WorkerData;
- private _index: number;
- private _concurrentWorkers: number;
private _worker: Worker;
/**
*
* @param {string} workerScript
* @param {WorkerData} workerData
- * @param {number} numConcurrentWorkers
*/
- constructor(workerScript: string, workerData: WorkerData, numConcurrentWorkers: number) {
+ constructor(workerScript: string, workerData: WorkerData) {
this._workerData = workerData;
- this._index = workerData.index;
this._workerScript = workerScript;
if (Configuration.useWorkerPool()) {
- this._concurrentWorkers = Configuration.getWorkerPoolSize();
- WorkerPool.concurrentWorkers = this._concurrentWorkers;
- } else {
- this._concurrentWorkers = numConcurrentWorkers;
+ WorkerPool.maxConcurrentWorkers = Configuration.getWorkerPoolSize();
}
}
- /**
- * @return {number}
- * @public
- */
- public get concurrentWorkers(): number {
- return this._concurrentWorkers;
- }
-
/**
*
* @return {Promise}
*/
async start(): Promise<Worker> {
if (Configuration.useWorkerPool()) {
- this._startWorkerWithPool();
+ await this._startWorkerWithPool();
} else {
- this._startWorker();
+ await this._startWorker();
}
return this._worker;
}
- /**
+ /**
*
- * @return {Promise}
+ * @return {void}
* @public
*/
- async startNewChargingStation(workerData: WorkerData, numConcurrentWorkers: number): Promise<void> {
+ addWorkerElement(workerData: WorkerData): void {
+ // FIXME: also forbid to add an element if the current number of elements > max number of elements
+ if (Configuration.useWorkerPool()) {
+ return;
+ }
this._workerData = workerData;
- this._index = workerData.index;
- this._concurrentWorkers = numConcurrentWorkers;
- this._worker.postMessage({ id : Constants.START_NEW_CHARGING_STATION, workerData: workerData });
+ this._worker.postMessage({ id : Constants.START_WORKER_ELEMENT, workerData: workerData });
}
/**
worker.on('error', reject);
worker.on('exit', (code) => {
if (code !== 0) {
- reject(new Error(`Worker id ${this._index} stopped with exit code ${code}`));
+ reject(new Error(`Worker stopped with exit code ${code}`));
}
});
this._worker = worker;
}
class WorkerPool {
- public static concurrentWorkers: number;
+ public static maxConcurrentWorkers: number;
private static _instance: Pool;
private constructor() { }
public static getInstance(): Pool {
- if (!WorkerPool._instance || (WorkerPool._instance?.size === WorkerPool.concurrentWorkers)) {
- WorkerPool._instance = new Pool({ max: WorkerPool.concurrentWorkers });
+ if (!WorkerPool._instance) {
+ WorkerPool._instance = new Pool({ max: WorkerPool.maxConcurrentWorkers });
}
return WorkerPool._instance;
}