X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=ff9eaf36a93791b2d4e0002c2decd22402e92607;hb=9adcefabee69d0c8a8f580c2512e35d2c54c8219;hp=4ea68d40cd127632de1fed3b94568aa531ebe8cb;hpb=932fc8be063cc15b543ad14c2ab6df0fa4224fba;p=poolifier.git diff --git a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts index 4ea68d40..ff9eaf36 100644 --- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts @@ -2,10 +2,11 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' -import type { - IWorkerChoiceStrategy, - TaskStatisticsRequirements, - WorkerChoiceStrategyOptions +import { + type IWorkerChoiceStrategy, + Measurements, + type TaskStatisticsRequirements, + type WorkerChoiceStrategyOptions } from './selection-strategies-types' /** @@ -35,7 +36,11 @@ export class FairShareWorkerChoiceStrategy< average: false, median: false }, - elu: false + elu: { + aggregate: true, + average: true, + median: false + } } /** @@ -105,9 +110,11 @@ export class FairShareWorkerChoiceStrategy< workerNodeKey: number, workerVirtualTaskStartTimestamp: number ): number { - return ( - workerVirtualTaskStartTimestamp + this.getWorkerTaskRunTime(workerNodeKey) - ) + const workerTaskRunTime = + this.opts.measurement === Measurements.elu + ? this.getWorkerTaskElu(workerNodeKey) + : this.getWorkerTaskRunTime(workerNodeKey) + return workerVirtualTaskStartTimestamp + workerTaskRunTime } private getWorkerVirtualTaskStartTimestamp (workerNodeKey: number): number {