X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=7f26706d6d2a7d4b8780bb086a07a413279c23bd;hb=85003dff831b309b12d624215a8d67634af82b50;hp=a060cea3a5ba4486059fec1f6b45dac515f155e3;hpb=6c6afb8463782af0689101b7c67cea80df83018f;p=poolifier.git diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index a060cea3..7f26706d 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,5 +1,8 @@ import { cpus } from 'node:os' -import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' +import { + DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS +} from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import type { @@ -13,18 +16,23 @@ import type { * Worker choice strategy abstract base class. * * @typeParam Worker - Type of worker which manages the strategy. - * @typeParam Data - Type of data sent to the worker. This can only be serializable data. - * @typeParam Response - Type of execution response. This can only be serializable data. + * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data. + * @typeParam Response - Type of execution response. This can only be structured-cloneable data. */ export abstract class AbstractWorkerChoiceStrategy< Worker extends IWorker, Data = unknown, Response = unknown > implements IWorkerChoiceStrategy { + // /** + // * Toggles finding the last free worker node key. + // */ + // private toggleFindLastFreeWorkerNodeKey: boolean = false + /** - * Toggles finding the last free worker node key. + * Id of the next worker node. */ - private toggleFindLastFreeWorkerNodeKey: boolean = false + protected nextWorkerNodeId: number = 0 /** @inheritDoc */ public readonly strategyPolicy: StrategyPolicy = { @@ -33,21 +41,9 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = { - runTime: { - aggregate: false, - average: false, - median: false - }, - waitTime: { - aggregate: false, - average: false, - median: false - }, - elu: { - aggregate: false, - average: false, - median: false - } + runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } /** @@ -128,24 +124,23 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public setOptions (opts: WorkerChoiceStrategyOptions): void { - opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS - this.setTaskStatisticsRequirements(opts) - this.opts = opts + this.opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + this.setTaskStatisticsRequirements(this.opts) } - /** - * Finds a free worker node key. - * - * @returns The free worker node key or `-1` if there is no free worker node. - */ - protected findFreeWorkerNodeKey (): number { - if (this.toggleFindLastFreeWorkerNodeKey) { - this.toggleFindLastFreeWorkerNodeKey = false - return this.findLastFreeWorkerNodeKey() - } - this.toggleFindLastFreeWorkerNodeKey = true - return this.findFirstFreeWorkerNodeKey() - } + // /** + // * Finds a free worker node key. + // * + // * @returns The free worker node key or `-1` if there is no free worker node. + // */ + // protected findFreeWorkerNodeKey (): number { + // if (this.toggleFindLastFreeWorkerNodeKey) { + // this.toggleFindLastFreeWorkerNodeKey = false + // return this.findLastFreeWorkerNodeKey() + // } + // this.toggleFindLastFreeWorkerNodeKey = true + // return this.findFirstFreeWorkerNodeKey() + // } /** * Gets the worker task runtime. @@ -157,8 +152,8 @@ export abstract class AbstractWorkerChoiceStrategy< */ protected getWorkerTaskRunTime (workerNodeKey: number): number { return this.taskStatisticsRequirements.runTime.median - ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median - : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average + ? this.pool.workerNodes[workerNodeKey].usage.runTime?.median ?? 0 + : this.pool.workerNodes[workerNodeKey].usage.runTime?.average ?? 0 } /** @@ -171,8 +166,8 @@ export abstract class AbstractWorkerChoiceStrategy< */ protected getWorkerTaskWaitTime (workerNodeKey: number): number { return this.taskStatisticsRequirements.waitTime.median - ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median - : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average + ? this.pool.workerNodes[workerNodeKey].usage.waitTime?.median ?? 0 + : this.pool.workerNodes[workerNodeKey].usage.waitTime?.average ?? 0 } /** @@ -185,8 +180,8 @@ export abstract class AbstractWorkerChoiceStrategy< */ protected getWorkerTaskElu (workerNodeKey: number): number { return this.taskStatisticsRequirements.elu.median - ? this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.median - : this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.average + ? this.pool.workerNodes[workerNodeKey].usage.elu.active?.median ?? 0 + : this.pool.workerNodes[workerNodeKey].usage.elu.active?.average ?? 0 } protected computeDefaultWorkerWeight (): number { @@ -200,46 +195,44 @@ export abstract class AbstractWorkerChoiceStrategy< return Math.round(cpusCycleTimeWeight / cpus().length) } - /** - * Finds the first free worker node key based on the number of tasks the worker has applied. - * - * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. - * - * If no free worker is found, `-1` is returned. - * - * @returns A worker node key if there is one, `-1` otherwise. - */ - private findFirstFreeWorkerNodeKey (): number { - return this.pool.workerNodes.findIndex(workerNode => { - return workerNode.workerUsage.tasks.executing === 0 - }) - } - - /** - * Finds the last free worker node key based on the number of tasks the worker has applied. - * - * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. - * - * If no free worker is found, `-1` is returned. - * - * @returns A worker node key if there is one, `-1` otherwise. - */ - private findLastFreeWorkerNodeKey (): number { - // It requires node >= 18.0.0: - // return this.workerNodes.findLastIndex(workerNode => { - // return workerNode.workerUsage.tasks.executing === 0 - // }) - for ( - let workerNodeKey = this.pool.workerNodes.length - 1; - workerNodeKey >= 0; - workerNodeKey-- - ) { - if ( - this.pool.workerNodes[workerNodeKey].workerUsage.tasks.executing === 0 - ) { - return workerNodeKey - } - } - return -1 - } + // /** + // * Finds the first free worker node key based on the number of tasks the worker has applied. + // * + // * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. + // * + // * If no free worker is found, `-1` is returned. + // * + // * @returns A worker node key if there is one, `-1` otherwise. + // */ + // private findFirstFreeWorkerNodeKey (): number { + // return this.pool.workerNodes.findIndex(workerNode => { + // return workerNode.usage.tasks.executing === 0 + // }) + // } + + // /** + // * Finds the last free worker node key based on the number of tasks the worker has applied. + // * + // * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. + // * + // * If no free worker is found, `-1` is returned. + // * + // * @returns A worker node key if there is one, `-1` otherwise. + // */ + // private findLastFreeWorkerNodeKey (): number { + // // It requires node >= 18.0.0: + // // return this.pool.workerNodes.findLastIndex(workerNode => { + // // return workerNode.usage.tasks.executing === 0 + // // }) + // for ( + // let workerNodeKey = this.pool.workerNodes.length - 1; + // workerNodeKey >= 0; + // workerNodeKey-- + // ) { + // if (this.pool.workerNodes[workerNodeKey].usage.tasks.executing === 0) { + // return workerNodeKey + // } + // } + // return -1 + // } }