refactor: remove unneeded intermediate variable

[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 a7892c4036e3b6e9ef742cad0bdc02eb16dbdbf3..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
@@ -1,33 +1,38 @@
-import type { AbstractPoolWorker } from '../abstract-pool-worker'
+import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 
 /**
  * Selects the less recently used worker.
  *
- * @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 serializable data.
+ * @typeParam Response - Type of response of execution. This can only be serializable data.
  */
 export class LessRecentlyUsedWorkerChoiceStrategy<
-  Worker extends AbstractPoolWorker,
+  Worker extends IPoolWorker,
   Data,
   Response
 > extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** @inheritdoc */
+  /** {@inheritDoc} */
+  public reset (): boolean {
+    return true
+  }
+
+  /** {@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)
-      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 !== undefined &&
-        workerRunningTasks < minNumberOfRunningTasks
-      ) {
+      } else if (workerTasks < minNumberOfTasks) {
+        minNumberOfTasks = workerTasks
         lessRecentlyUsedWorker = worker
-        minNumberOfRunningTasks = workerRunningTasks
       }
     }
     return lessRecentlyUsedWorker