refactor: remove unneeded encapsulation around tasks usage handling

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

diff --git a/src/pools/selection-strategies/less-recently-used-worker-choice-strategy.ts b/src/pools/selection-strategies/less-recently-used-worker-choice-strategy.ts
index e62d9cdf83bd9a5ae472bc08296dfbe18b96e806..fc64a74a6bc7e2085b7e623b5ddc222825d019da 100644 (file)
--- a/src/pools/selection-strategies/less-recently-used-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/less-recently-used-worker-choice-strategy.ts
@@ -20,18 +20,19 @@ export class LessRecentlyUsedWorkerChoiceStrategy<
 
   /** {@inheritDoc} */
   public choose (): Worker {
-    let minNumberOfRunningTasks = Infinity
+    let minNumberOfTasks = Infinity
     // A worker is always found because it picks the one with fewer tasks
     let lessRecentlyUsedWorker!: Worker
-    for (const worker of this.pool.workers) {
-      const workerRunningTasks = this.pool.getWorkerRunningTasks(
-        worker
-      ) as number
-      if (!this.isDynamicPool && workerRunningTasks === 0) {
+    for (const value of this.pool.workers.values()) {
+      const worker = value.worker
+      const tasksUsage = this.pool.getWorkerTasksUsage(worker)
+      const workerTasks =
+        (tasksUsage?.run as number) + (tasksUsage?.running as number)
+      if (!this.isDynamicPool && workerTasks === 0) {
         return worker
-      } else if (workerRunningTasks < minNumberOfRunningTasks) {
+      } else if (workerTasks < minNumberOfTasks) {
+        minNumberOfTasks = workerTasks
         lessRecentlyUsedWorker = worker
-        minNumberOfRunningTasks = workerRunningTasks
       }
     }
     return lessRecentlyUsedWorker