X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fless-used-worker-choice-strategy.ts;h=e3c395f477e4adb1d8a042ca71317c84111aae60;hb=cb70b19deb97dc2c8ad1a769e59e870ee37f8e4d;hp=833e605babc9cb0b2f1fcf46d4a823b291e5fa73;hpb=e65c6cd9a3d6ed2e5b8af95120a5aa070101e945;p=poolifier.git

diff --git a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
index 833e605b..e3c395f4 100644
--- a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
@@ -1,39 +1,63 @@
-import type { IPoolWorker } from '../pool-worker'
+import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
+import type { IPool } from '../pool'
+import type { IWorker } from '../worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
+import type {
+  IWorkerChoiceStrategy,
+  WorkerChoiceStrategyOptions
+} from './selection-strategies-types'
 
 /**
  * Selects the less used worker.
  *
  * @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.
+ * @typeParam Response - Type of execution response. This can only be serializable data.
  */
 export class LessUsedWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** {@inheritDoc} */
+    Worker extends IWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
+  /** @inheritDoc */
+  public constructor (
+    pool: IPool<Worker, Data, Response>,
+    opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+  ) {
+    super(pool, opts)
+    this.checkOptions(this.opts)
+  }
+
+  /** @inheritDoc */
   public reset (): boolean {
     return true
   }
 
-  /** {@inheritDoc} */
-  public choose (): Worker {
+  /** @inheritDoc */
+  public choose (): number {
+    const freeWorkerNodeKey = this.findFreeWorkerNodeKey()
+    if (freeWorkerNodeKey !== -1) {
+      return freeWorkerNodeKey
+    }
     let minNumberOfTasks = Infinity
-    let lessUsedWorker!: Worker
-    for (const workerItem of this.pool.workers) {
-      const worker = workerItem.worker
-      const tasksUsage = this.pool.getWorkerTasksUsage(worker)
-      const workerTasks =
-        (tasksUsage?.run as number) + (tasksUsage?.running as number)
-      if (!this.isDynamicPool && workerTasks === 0) {
-        return worker
+    let lessUsedWorkerNodeKey!: number
+    for (const [index, workerNode] of this.pool.workerNodes.entries()) {
+      const tasksUsage = workerNode.tasksUsage
+      const workerTasks = tasksUsage.run + tasksUsage.running
+      if (workerTasks === 0) {
+        return index
       } else if (workerTasks < minNumberOfTasks) {
         minNumberOfTasks = workerTasks
-        lessUsedWorker = worker
+        lessUsedWorkerNodeKey = index
       }
     }
-    return lessUsedWorker
+    return lessUsedWorkerNodeKey
+  }
+
+  /** @inheritDoc */
+  public remove (workerNodeKey: number): boolean {
+    return true
   }
 }