refactor: untangle worker choosing code from worker creation code

[poolifier.git] / src / pools / selection-strategies / less-busy-worker-choice-strategy.ts

diff --git a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
index 769f3fb6b5626eed0841a1b6acf86f7d3ebe0bcd..87ef804d50881f157e2810a715c2db4627315f33 100644 (file)
--- a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/less-busy-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'
 
 /**
  * Selects the less busy worker.
@@ -10,35 +13,45 @@ import type { RequiredStatistics } from './selection-strategies-types'
  * @typeParam Response - Type of response of execution. This can only be serializable data.
  */
 export class LessBusyWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** {@inheritDoc} */
+    Worker extends IPoolWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
+  /** @inheritDoc */
   public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true
+    runTime: true,
+    avgRunTime: false
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public reset (): boolean {
     return true
   }
 
-  /** {@inheritDoc} */
-  public choose (): Worker {
+  /** @inheritDoc */
+  public choose (): number {
+    const freeWorkerKey = this.pool.findFreeWorkerKey()
+    if (freeWorkerKey !== -1) {
+      return freeWorkerKey
+    }
     let minRunTime = Infinity
-    let lessBusyWorker!: Worker
-    for (const value of this.pool.workers.values()) {
-      const worker = value.worker
-      const workerRunTime = this.pool.getWorkerTasksUsage(worker)
-        ?.runTime as number
-      if (!this.isDynamicPool && workerRunTime === 0) {
-        return worker
+    let lessBusyWorkerKey!: number
+    for (const [index, workerItem] of this.pool.workers.entries()) {
+      const workerRunTime = workerItem.tasksUsage.runTime
+      if (workerRunTime === 0) {
+        return index
       } else if (workerRunTime < minRunTime) {
         minRunTime = workerRunTime
-        lessBusyWorker = worker
+        lessBusyWorkerKey = index
       }
     }
-    return lessBusyWorker
+    return lessBusyWorkerKey
+  }
+
+  /** @inheritDoc */
+  public remove (workerKey: number): boolean {
+    return true
   }
 }