WRR: Fix worker choice initial runtime value on each round

[poolifier.git] / src / pools / selection-strategies / weighted-round-robin-worker-choice-strategy.ts

diff --git a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
index 2b9cfc74536851ee39f0616d92932323c730031c..4b1e5382af333d2edb59eb5ae41d1c5132f6ccb3 100644 (file)
--- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@ -67,33 +67,35 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): Worker {
-    let chosenWorker = this.pool.workers[this.currentWorkerIndex]
+    const chosenWorker = this.pool.workers[this.currentWorkerIndex]
     if (
       this.isDynamicPool === true &&
       this.workersTaskRunTime.has(chosenWorker) === false
     ) {
       this.initWorkerTaskRunTime(chosenWorker)
     }
+    const workerTaskRunTime =
+      this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0
     const workerTaskWeight =
       this.workersTaskRunTime.get(chosenWorker)?.weight ??
       this.defaultWorkerWeight
-    if (
-      (this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0) <
-      workerTaskWeight
-    ) {
+    if (workerTaskRunTime < workerTaskWeight) {
       this.setWorkerTaskRunTime(
         chosenWorker,
         workerTaskWeight,
-        (this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0) +
+        workerTaskRunTime +
           (this.getWorkerVirtualTaskRunTime(chosenWorker) ?? 0)
       )
     } else {
       this.currentWorkerIndex =
-        this.pool.workers.length - 1 === this.currentWorkerIndex
+        this.currentWorkerIndex === this.pool.workers.length - 1
           ? 0
           : this.currentWorkerIndex + 1
-      chosenWorker = this.pool.workers[this.currentWorkerIndex]
-      this.setWorkerTaskRunTime(chosenWorker, workerTaskWeight, 0)
+      this.setWorkerTaskRunTime(
+        this.pool.workers[this.currentWorkerIndex],
+        workerTaskWeight,
+        0
+      )
     }
     return chosenWorker
   }
@@ -127,9 +129,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
     let cpusCycleTimeWeight = 0
     for (const cpu of cpus()) {
       // CPU estimated cycle time
-      const numberOfDigit = cpu.speed.toString().length - 1
-      const cpuCycleTime = 1 / (cpu.speed / Math.pow(10, numberOfDigit))
-      cpusCycleTimeWeight += cpuCycleTime * Math.pow(10, numberOfDigit)
+      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)
   }