X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=78ad7485dcc58ddb8c65ebb946fcdc6a34b92f5d;hb=f6bc9f26d8a0246bbee14b2b03d0bcc41b8aeb52;hp=2b9cfc74536851ee39f0616d92932323c730031c;hpb=11df35903da6f581c45e8b42e1d4fbd342bddc3c;p=poolifier.git

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 2b9cfc74..78ad7485 100644
--- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@ -1,136 +1,117 @@
-import { cpus } from 'os'
-import type { IPoolInternal } from '../pool-internal'
-import type { IPoolWorker } from '../pool-worker'
+import type { IWorker } from '../worker'
+import type { IPool } from '../pool'
+import {
+  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+} from '../../utils'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
-import type { RequiredStatistics } from './selection-strategies-types'
-
-/**
- * Virtual task runtime.
- */
-type TaskRunTime = {
-  weight: number
-  runTime: number
-}
+import type {
+  IWorkerChoiceStrategy,
+  TaskStatisticsRequirements,
+  WorkerChoiceStrategyOptions
+} from './selection-strategies-types'
 
 /**
  * Selects the next worker with a weighted round robin scheduling algorithm.
  * Loosely modeled after the weighted round robin queueing algorithm: https://en.wikipedia.org/wiki/Weighted_round_robin.
  *
- * @template Worker Type of worker which manages the strategy.
- * @template Data Type of data sent to the worker. This can only be serializable data.
- * @template Response Type of response of execution. This can only be serializable data.
+ * @typeParam Worker - Type of worker which manages the strategy.
+ * @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 WeightedRoundRobinWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
+    Worker extends IWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
   /** @inheritDoc */
-  public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true
+  public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
+    runTime: {
+      aggregate: true,
+      average: true,
+      median: false
+    },
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS
   }
 
-  /**
-   * Worker index where the current task will be submitted.
-   */
-  private currentWorkerIndex: number = 0
   /**
    * Default worker weight.
    */
   private readonly defaultWorkerWeight: number
   /**
-   * Per worker virtual task runtime map.
+   * Worker virtual task runtime.
    */
-  private readonly workersTaskRunTime: Map<Worker, TaskRunTime> = new Map<
-    Worker,
-    TaskRunTime
-  >()
+  private workerVirtualTaskRunTime: number = 0
 
-  /**
-   * Constructs a worker choice strategy that selects with a weighted round robin scheduling algorithm.
-   *
-   * @param pool The pool instance.
-   */
-  public constructor (pool: IPoolInternal<Worker, Data, Response>) {
-    super(pool)
-    this.defaultWorkerWeight = this.computeWorkerWeight()
-    this.initWorkersTaskRunTime()
+  /** @inheritDoc */
+  public constructor (
+    pool: IPool<Worker, Data, Response>,
+    opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+  ) {
+    super(pool, opts)
+    this.setTaskStatisticsRequirements(this.opts)
+    this.defaultWorkerWeight = this.computeDefaultWorkerWeight()
   }
 
   /** @inheritDoc */
   public reset (): boolean {
-    this.currentWorkerIndex = 0
-    this.workersTaskRunTime.clear()
-    this.initWorkersTaskRunTime()
+    this.nextWorkerNodeKey = 0
+    this.workerVirtualTaskRunTime = 0
     return true
   }
 
   /** @inheritDoc */
-  public choose (): Worker {
-    let chosenWorker = this.pool.workers[this.currentWorkerIndex]
-    if (
-      this.isDynamicPool === true &&
-      this.workersTaskRunTime.has(chosenWorker) === false
-    ) {
-      this.initWorkerTaskRunTime(chosenWorker)
-    }
-    const workerTaskWeight =
-      this.workersTaskRunTime.get(chosenWorker)?.weight ??
-      this.defaultWorkerWeight
-    if (
-      (this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0) <
-      workerTaskWeight
-    ) {
-      this.setWorkerTaskRunTime(
-        chosenWorker,
-        workerTaskWeight,
-        (this.workersTaskRunTime.get(chosenWorker)?.runTime ?? 0) +
-          (this.getWorkerVirtualTaskRunTime(chosenWorker) ?? 0)
-      )
-    } else {
-      this.currentWorkerIndex =
-        this.pool.workers.length - 1 === this.currentWorkerIndex
-          ? 0
-          : this.currentWorkerIndex + 1
-      chosenWorker = this.pool.workers[this.currentWorkerIndex]
-      this.setWorkerTaskRunTime(chosenWorker, workerTaskWeight, 0)
-    }
-    return chosenWorker
+  public update (): boolean {
+    return true
   }
 
-  private initWorkersTaskRunTime (): void {
-    for (const worker of this.pool.workers) {
-      this.initWorkerTaskRunTime(worker)
+  /** @inheritDoc */
+  public choose (): number | undefined {
+    const chosenWorkerNodeKey = this.nextWorkerNodeKey
+    this.weightedRoundRobinNextWorkerNodeKey()
+    if (!this.isWorkerNodeEligible(this.nextWorkerNodeKey as number)) {
+      this.nextWorkerNodeKey = undefined
+      this.previousWorkerNodeKey =
+        chosenWorkerNodeKey ?? this.previousWorkerNodeKey
     }
+    return chosenWorkerNodeKey
   }
 
-  private initWorkerTaskRunTime (worker: Worker): void {
-    this.setWorkerTaskRunTime(worker, this.defaultWorkerWeight, 0)
-  }
-
-  private setWorkerTaskRunTime (
-    worker: Worker,
-    weight: number,
-    runTime: number
-  ): void {
-    this.workersTaskRunTime.set(worker, {
-      weight,
-      runTime
-    })
-  }
-
-  private getWorkerVirtualTaskRunTime (worker: Worker): number | undefined {
-    return this.pool.getWorkerAverageTasksRunTime(worker)
+  /** @inheritDoc */
+  public remove (workerNodeKey: number): boolean {
+    if (this.nextWorkerNodeKey === workerNodeKey) {
+      if (this.pool.workerNodes.length === 0) {
+        this.nextWorkerNodeKey = 0
+      } else if (this.nextWorkerNodeKey > this.pool.workerNodes.length - 1) {
+        this.nextWorkerNodeKey = this.pool.workerNodes.length - 1
+      }
+      this.workerVirtualTaskRunTime = 0
+    }
+    return true
   }
 
-  private computeWorkerWeight (): number {
-    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)
+  private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
+    const workerVirtualTaskRunTime = this.workerVirtualTaskRunTime
+    const workerWeight =
+      this.opts.weights?.[
+        this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+      ] ?? this.defaultWorkerWeight
+    if (workerVirtualTaskRunTime < workerWeight) {
+      this.workerVirtualTaskRunTime =
+        workerVirtualTaskRunTime +
+        this.getWorkerTaskRunTime(
+          this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+        )
+    } else {
+      this.nextWorkerNodeKey =
+        this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
+          ? 0
+          : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
+      this.workerVirtualTaskRunTime = 0
     }
-    return Math.round(cpusCycleTimeWeight / cpus().length)
+    return this.nextWorkerNodeKey
   }
 }