X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=6e798fbc4349d98bf5b5761d884013382efa601f;hb=0bbf65c3768b86f989056de36de0199d6e35562a;hp=d969f0c0ad5ca224de0d30356d517821b1e76c3c;hpb=9e45c2c437217612e71b46b207a994f9106dff23;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 d969f0c0..6e798fbc 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,3 +1,4 @@ +import { cpus } from 'node:os' import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' @@ -27,7 +28,10 @@ export abstract class AbstractWorkerChoiceStrategy< public readonly requiredStatistics: RequiredStatistics = { runTime: false, avgRunTime: false, - medRunTime: false + medRunTime: false, + waitTime: false, + avgWaitTime: false, + medWaitTime: false } /** @@ -52,6 +56,14 @@ export abstract class AbstractWorkerChoiceStrategy< this.requiredStatistics.avgRunTime = true this.requiredStatistics.medRunTime = opts.medRunTime as boolean } + if (this.requiredStatistics.avgWaitTime && opts.medWaitTime === true) { + this.requiredStatistics.avgWaitTime = false + this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + } + if (this.requiredStatistics.medWaitTime && opts.medWaitTime === false) { + this.requiredStatistics.avgWaitTime = true + this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + } } /** @inheritDoc */ @@ -101,6 +113,31 @@ export abstract class AbstractWorkerChoiceStrategy< : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime } + /** + * Gets the worker task wait time. + * If the required statistics are `avgWaitTime`, the average wait time is returned. + * If the required statistics are `medWaitTime`, the median wait time is returned. + * + * @param workerNodeKey - The worker node key. + * @returns The worker task wait time. + */ + protected getWorkerWaitTime (workerNodeKey: number): number { + return this.requiredStatistics.medWaitTime + ? this.pool.workerNodes[workerNodeKey].tasksUsage.medWaitTime + : this.pool.workerNodes[workerNodeKey].tasksUsage.avgWaitTime + } + + 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 Math.round(cpusCycleTimeWeight / cpus().length) + } + /** * Finds the first free worker node key based on the number of tasks the worker has applied. *