X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=1fe68ffae7a92b2397b22050bf12266143168540;hb=02b9f29b9b6fafd5e811dfbce4a7e0d65caf5123;hp=af8eb75d03995d1eb37eeb8daf8d44a8cb6d9d70;hpb=c923ce5670eeae4194aa996d44a1071e88cb21ad;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 af8eb75d..1fe68ffa 100644 --- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts @@ -1,6 +1,9 @@ import type { IPoolWorker } from '../pool-worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' -import type { RequiredStatistics } from './selection-strategies-types' +import type { + IWorkerChoiceStrategy, + RequiredStatistics +} from './selection-strategies-types' /** * Worker virtual task timestamp. @@ -19,13 +22,16 @@ interface WorkerVirtualTaskTimestamp { * @typeParam Response - Type of response of execution. This can only be serializable data. */ export class FairShareWorkerChoiceStrategy< - Worker extends IPoolWorker, - Data, - Response -> extends AbstractWorkerChoiceStrategy { + Worker extends IPoolWorker, + Data, + Response + > + extends AbstractWorkerChoiceStrategy + implements IWorkerChoiceStrategy { /** {@inheritDoc} */ public readonly requiredStatistics: RequiredStatistics = { - runTime: true + runTime: true, + avgRunTime: true } /** @@ -60,6 +66,17 @@ export class FairShareWorkerChoiceStrategy< return chosenWorkerKey } + /** {@inheritDoc} */ + public remove (workerKey: number): boolean { + const workerDeleted = this.workerLastVirtualTaskTimestamp.delete(workerKey) + for (const [key, value] of this.workerLastVirtualTaskTimestamp.entries()) { + if (key > workerKey) { + this.workerLastVirtualTaskTimestamp.set(key - 1, value) + } + } + return workerDeleted + } + /** * Computes worker last virtual task timestamp. *