X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Finterleaved-weighted-round-robin-worker-choice-strategy.ts;h=b034cba1d08d69761b3c8f05fdedf395c4702c0a;hb=ae3ab61d14adc1f0511e8dea1f69a1d44e7effdf;hp=09598355690bd0c65805fa3fdac03ab56bbba495;hpb=feec6e8c04165c3c70a12c9a1c5e64a32b40311c;p=poolifier.git

diff --git a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
index 09598355..b034cba1 100644
--- a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
@@ -1,11 +1,13 @@
-import { cpus } from 'node:os'
 import type { IWorker } from '../worker'
 import type { IPool } from '../pool'
-import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
+import {
+  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+} from '../../utils'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  RequiredStatistics,
+  TaskStatisticsRequirements,
   WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
@@ -13,8 +15,8 @@ import type {
  * Selects the next worker with an interleaved weighted round robin scheduling algorithm.
  *
  * @typeParam Worker - Type of worker which manages the strategy.
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
+ * @typeParam Response - Type of execution response. This can only be structured-cloneable data.
  */
 export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
     Worker extends IWorker,
@@ -24,29 +26,36 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
   implements IWorkerChoiceStrategy {
   /** @inheritDoc */
-  public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true,
-    avgRunTime: true,
-    medRunTime: false
+  public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
+    runTime: {
+      aggregate: true,
+      average: true,
+      median: false
+    },
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS
   }
 
   /**
-   * Worker node id where the current task will be submitted.
+   * Round id.
    */
-  private currentWorkerNodeId: number = 0
+  private roundId: number = 0
   /**
-   * Current round id.
-   * This is used to determine the current round weight.
+   * Default worker weight.
    */
-  private currentRoundId: number = 0
+  private readonly defaultWorkerWeight: number
   /**
    * Round weights.
    */
-  private readonly roundWeights: number[]
+  private roundWeights: number[]
   /**
-   * Default worker weight.
+   * Worker node id.
    */
-  private readonly defaultWorkerWeight: number
+  private workerNodeId: number = 0
+  /**
+   * Worker node virtual task runtime.
+   */
+  private workerNodeVirtualTaskRunTime: number = 0
 
   /** @inheritDoc */
   public constructor (
@@ -54,15 +63,17 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
     opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
   ) {
     super(pool, opts)
-    this.checkOptions(this.opts)
+    this.setTaskStatisticsRequirements(this.opts)
     this.defaultWorkerWeight = this.computeDefaultWorkerWeight()
     this.roundWeights = this.getRoundWeights()
   }
 
   /** @inheritDoc */
   public reset (): boolean {
-    this.currentWorkerNodeId = 0
-    this.currentRoundId = 0
+    this.resetWorkerNodeKeyProperties()
+    this.roundId = 0
+    this.workerNodeId = 0
+    this.workerNodeVirtualTaskRunTime = 0
     return true
   }
 
@@ -72,75 +83,82 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
-    let chosenWorkerNodeKey: number
-    const workerWeight =
-      this.opts.weights?.[this.currentWorkerNodeId] ?? this.defaultWorkerWeight
-    if (workerWeight >= this.roundWeights[this.currentRoundId]) {
-      chosenWorkerNodeKey = this.currentWorkerNodeId
-      this.currentWorkerNodeId =
-        this.currentWorkerNodeId === this.pool.workerNodes.length - 1
-          ? 0
-          : this.currentWorkerNodeId + 1
-      if (this.currentWorkerNodeId === this.pool.workerNodes.length - 1) {
-        this.currentRoundId =
-          this.currentRoundId === this.roundWeights.length - 1
-            ? 0
-            : this.currentRoundId + 1
-      }
-    } else {
-      let roundId: number | undefined
-      let workerNodeId: number | undefined
+  public choose (): number | undefined {
+    for (
+      let roundIndex = this.roundId;
+      roundIndex < this.roundWeights.length;
+      roundIndex++
+    ) {
+      this.roundId = roundIndex
       for (
-        let round = this.currentRoundId;
-        round < this.roundWeights.length;
-        round++
+        let workerNodeKey = this.workerNodeId;
+        workerNodeKey < this.pool.workerNodes.length;
+        workerNodeKey++
       ) {
-        for (
-          let workerNodeKey = this.currentWorkerNodeId + 1;
-          workerNodeKey < this.pool.workerNodes.length;
-          workerNodeKey++
+        this.workerNodeId = workerNodeKey
+        if (
+          this.workerNodeId !== this.nextWorkerNodeKey &&
+          this.workerNodeVirtualTaskRunTime !== 0
+        ) {
+          this.workerNodeVirtualTaskRunTime = 0
+        }
+        const workerWeight =
+          this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
+        if (
+          workerWeight >= this.roundWeights[roundIndex] &&
+          this.workerNodeVirtualTaskRunTime < workerWeight
         ) {
-          const workerWeight =
-            this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
-          if (workerWeight >= this.roundWeights[round]) {
-            roundId = round
-            workerNodeId = workerNodeKey
-            break
-          }
+          this.workerNodeVirtualTaskRunTime =
+            this.workerNodeVirtualTaskRunTime +
+            this.getWorkerNodeTaskRunTime(workerNodeKey)
+          this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
+          this.nextWorkerNodeKey = workerNodeKey
+          return this.nextWorkerNodeKey
         }
       }
-      this.currentRoundId = roundId ?? 0
-      this.currentWorkerNodeId = workerNodeId ?? 0
-      chosenWorkerNodeKey = this.currentWorkerNodeId
     }
-    return chosenWorkerNodeKey
+    this.interleavedWeightedRoundRobinNextWorkerNodeId()
+  }
+
+  private interleavedWeightedRoundRobinNextWorkerNodeId (): void {
+    if (
+      this.roundId === this.roundWeights.length - 1 &&
+      this.workerNodeId === this.pool.workerNodes.length - 1
+    ) {
+      this.roundId = 0
+      this.workerNodeId = 0
+    } else if (this.workerNodeId === this.pool.workerNodes.length - 1) {
+      this.roundId = this.roundId + 1
+      this.workerNodeId = 0
+    } else {
+      this.workerNodeId = this.workerNodeId + 1
+    }
   }
 
   /** @inheritDoc */
   public remove (workerNodeKey: number): boolean {
-    if (this.currentWorkerNodeId === workerNodeKey) {
-      if (this.pool.workerNodes.length === 0) {
-        this.currentWorkerNodeId = 0
-      } else {
-        this.currentWorkerNodeId =
-          this.currentWorkerNodeId > this.pool.workerNodes.length - 1
-            ? this.pool.workerNodes.length - 1
-            : this.currentWorkerNodeId
-      }
+    if (this.pool.workerNodes.length === 0) {
+      this.reset()
+    }
+    if (
+      this.workerNodeId === workerNodeKey &&
+      this.workerNodeId > this.pool.workerNodes.length - 1
+    ) {
+      this.workerNodeId = this.pool.workerNodes.length - 1
+    }
+    if (
+      this.previousWorkerNodeKey === workerNodeKey &&
+      this.previousWorkerNodeKey > this.pool.workerNodes.length - 1
+    ) {
+      this.previousWorkerNodeKey = this.pool.workerNodes.length - 1
     }
     return true
   }
 
-  private 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)
+  /** @inheritDoc */
+  public setOptions (opts: WorkerChoiceStrategyOptions): void {
+    super.setOptions(opts)
+    this.roundWeights = this.getRoundWeights()
   }
 
   private getRoundWeights (): number[] {