X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=9c20c5bea63143f3b3e556f2629b635026e32a2a;hb=57441b795f8680adcdfe1a58882d54fb41cce970;hp=5172a181a507fad13940216c933646c616ddb3fa;hpb=e102732c0e3966b81834b2c0bdd087eb051162ad;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 5172a181..9c20c5be 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,9 +1,13 @@ 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 { IWorkerChoiceStrategy, + MeasurementStatisticsRequirements, StrategyPolicy, TaskStatisticsRequirements, WorkerChoiceStrategyOptions @@ -21,15 +25,10 @@ export abstract class AbstractWorkerChoiceStrategy< Data = unknown, Response = unknown > implements IWorkerChoiceStrategy { - // /** - // * Toggles finding the last free worker node key. - // */ - // private toggleFindLastFreeWorkerNodeKey: boolean = false - /** - * Id of the next worker node. + * The next worker node key. */ - protected nextWorkerNodeId: number = 0 + protected nextWorkerNodeKey: number = 0 /** @inheritDoc */ public readonly strategyPolicy: StrategyPolicy = { @@ -38,21 +37,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 } /** @@ -71,51 +58,31 @@ export abstract class AbstractWorkerChoiceStrategy< protected setTaskStatisticsRequirements ( opts: WorkerChoiceStrategyOptions ): void { - if ( - this.taskStatisticsRequirements.runTime.average && - opts.runTime?.median === true - ) { - this.taskStatisticsRequirements.runTime.average = false - this.taskStatisticsRequirements.runTime.median = opts.runTime - .median as boolean - } - if ( - this.taskStatisticsRequirements.runTime.median && - opts.runTime?.median === false - ) { - this.taskStatisticsRequirements.runTime.average = true - this.taskStatisticsRequirements.runTime.median = opts.runTime - .median as boolean - } - if ( - this.taskStatisticsRequirements.waitTime.average && - opts.waitTime?.median === true - ) { - this.taskStatisticsRequirements.waitTime.average = false - this.taskStatisticsRequirements.waitTime.median = opts.waitTime - .median as boolean - } - if ( - this.taskStatisticsRequirements.waitTime.median && - opts.waitTime?.median === false - ) { - this.taskStatisticsRequirements.waitTime.average = true - this.taskStatisticsRequirements.waitTime.median = opts.waitTime - .median as boolean - } - if ( - this.taskStatisticsRequirements.elu.average && - opts.elu?.median === true - ) { - this.taskStatisticsRequirements.elu.average = false - this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean + this.toggleMedianMeasurementStatisticsRequirements( + this.taskStatisticsRequirements.runTime, + opts.runTime?.median as boolean + ) + this.toggleMedianMeasurementStatisticsRequirements( + this.taskStatisticsRequirements.waitTime, + opts.waitTime?.median as boolean + ) + this.toggleMedianMeasurementStatisticsRequirements( + this.taskStatisticsRequirements.elu, + opts.elu?.median as boolean + ) + } + + private toggleMedianMeasurementStatisticsRequirements ( + measurementStatisticsRequirements: MeasurementStatisticsRequirements, + toggleMedian: boolean + ): void { + if (measurementStatisticsRequirements.average && toggleMedian) { + measurementStatisticsRequirements.average = false + measurementStatisticsRequirements.median = toggleMedian } - if ( - this.taskStatisticsRequirements.elu.median && - opts.elu?.median === false - ) { - this.taskStatisticsRequirements.elu.average = true - this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean + if (measurementStatisticsRequirements.median && !toggleMedian) { + measurementStatisticsRequirements.average = true + measurementStatisticsRequirements.median = toggleMedian } } @@ -137,19 +104,15 @@ export abstract class AbstractWorkerChoiceStrategy< 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() - // } + /** + * Whether the worker node is ready or not. + * + * @param workerNodeKey - The worker node key. + * @returns Whether the worker node is ready or not. + */ + protected isWorkerNodeReady (workerNodeKey: number): boolean { + return this.pool.workerNodes[workerNodeKey].info.ready + } /** * Gets the worker task runtime. @@ -161,8 +124,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 } /** @@ -175,8 +138,8 @@ export abstract class AbstractWorkerChoiceStrategy< */ protected getWorkerTaskWaitTime (workerNodeKey: number): number { return this.taskStatisticsRequirements.waitTime.median - ? this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.median - : this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.average + ? this.pool.workerNodes[workerNodeKey].usage.waitTime?.median ?? 0 + : this.pool.workerNodes[workerNodeKey].usage.waitTime?.average ?? 0 } /** @@ -189,8 +152,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 { @@ -203,47 +166,4 @@ 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 - // } }