X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=121647b697139e9c068170d266d96f2c0837edad;hb=65ab8dcc71797783b49b913e0eda4964c6300751;hp=a4455d28a8e33c5bac1bceaf679b8feab5de533b;hpb=f6b641d651fdd5114bcd63bf1c991955d5b7d3eb;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 a4455d28..121647b6 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,9 +1,11 @@ +import { cpus } from 'node:os' import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import type { IWorkerChoiceStrategy, - RequiredStatistics, + StrategyPolicy, + TaskStatisticsRequirements, WorkerChoiceStrategyOptions } from './selection-strategies-types' @@ -19,15 +21,38 @@ export abstract class AbstractWorkerChoiceStrategy< 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 = { + useDynamicWorker: false + } + /** @inheritDoc */ - public readonly requiredStatistics: RequiredStatistics = { - runTime: false, - avgRunTime: false, - medRunTime: false + 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 + } } /** @@ -43,14 +68,54 @@ export abstract class AbstractWorkerChoiceStrategy< this.choose = this.choose.bind(this) } - protected setRequiredStatistics (opts: WorkerChoiceStrategyOptions): void { - if (this.requiredStatistics.avgRunTime && opts.medRunTime === true) { - this.requiredStatistics.avgRunTime = false - this.requiredStatistics.medRunTime = opts.medRunTime as boolean + 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 } - if (this.requiredStatistics.medRunTime && opts.medRunTime === false) { - this.requiredStatistics.avgRunTime = true - this.requiredStatistics.medRunTime = opts.medRunTime as boolean + if ( + this.taskStatisticsRequirements.elu.median && + opts.elu?.median === false + ) { + this.taskStatisticsRequirements.elu.average = true + this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean } } @@ -68,77 +133,117 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public setOptions (opts: WorkerChoiceStrategyOptions): void { - opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS - this.setRequiredStatistics(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 run time. - * If the required statistics are `avgRunTime`, the average run time is returned. - * If the required statistics are `medRunTime`, the median run time is returned. + * Gets the worker task runtime. + * If the task statistics require the average runtime, the average runtime is returned. + * If the task statistics require the median runtime , the median runtime is returned. * * @param workerNodeKey - The worker node key. - * @returns The worker task run time. + * @returns The worker task runtime. */ protected getWorkerTaskRunTime (workerNodeKey: number): number { - return this.requiredStatistics.medRunTime - ? this.pool.workerNodes[workerNodeKey].tasksUsage.medRunTime - : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime + return this.taskStatisticsRequirements.runTime.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median + : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average } /** - * Finds the first free worker node key based on the number of tasks the worker has applied. - * - * If a worker is found with `0` running tasks, it is detected as free and its worker node key is returned. + * Gets the worker task wait time. + * If the task statistics require the average wait time, the average wait time is returned. + * If the task statistics require the median wait time, the median wait time is returned. * - * If no free worker is found, `-1` is returned. - * - * @returns A worker node key if there is one, `-1` otherwise. + * @param workerNodeKey - The worker node key. + * @returns The worker task wait time. */ - private findFirstFreeWorkerNodeKey (): number { - return this.pool.workerNodes.findIndex(workerNode => { - return workerNode.tasksUsage.running === 0 - }) + protected getWorkerTaskWaitTime (workerNodeKey: number): number { + return this.taskStatisticsRequirements.waitTime.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.median + : this.pool.workerNodes[workerNodeKey].workerUsage.waitTime.average } /** - * Finds the last free worker node key based on the number of tasks the worker has applied. + * Gets the worker task ELU. + * If the task statistics require the average ELU, the average ELU is returned. + * If the task statistics require the median ELU, the median ELU is returned. * - * If a worker is found with `0` running 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. + * @param workerNodeKey - The worker node key. + * @returns The worker task ELU. */ - private findLastFreeWorkerNodeKey (): number { - // It requires node >= 18.0.0: - // return this.workerNodes.findLastIndex(workerNode => { - // return workerNode.tasksUsage.running === 0 - // }) - for ( - let workerNodeKey = this.pool.workerNodes.length - 1; - workerNodeKey >= 0; - workerNodeKey-- - ) { - if (this.pool.workerNodes[workerNodeKey].tasksUsage.running === 0) { - return workerNodeKey - } + 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 + } + + protected computeDefaultWorkerWeight (): number { + let cpusCycleTimeWeight = 0 + for (const cpu of cpus()) { + // CPU estimated cycle time + const numberOfDigits = cpu.speed.toString().length - 1 + const cpuCycleTime = 1 / (cpu.speed / Math.pow(10, numberOfDigits)) + cpusCycleTimeWeight += cpuCycleTime * Math.pow(10, numberOfDigits) } - return -1 + 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 + // } }