X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils.ts;h=a7cb55f971483d12729e259110b3d872da7b5f15;hb=a4d25410764bca884efaea4d46ed9bf83b8a8dbb;hp=f7aab63746e274b328d606fb3659a5353e796132;hpb=19910d842d15c3937508060925bec675609099d7;p=poolifier.git

diff --git a/src/utils.ts b/src/utils.ts
index f7aab637..a7cb55f9 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -4,11 +4,12 @@ import { Worker as ClusterWorker } from 'node:cluster'
 import { Worker as ThreadWorker } from 'node:worker_threads'
 import { cpus } from 'node:os'
 import type {
-  InternalWorkerChoiceStrategyOptions,
-  MeasurementStatisticsRequirements
-} from './pools/selection-strategies/selection-strategies-types'
-import type { KillBehavior } from './worker/worker-options'
-import { type IWorker, type WorkerType, WorkerTypes } from './pools/worker'
+  MeasurementStatisticsRequirements,
+  WorkerChoiceStrategyOptions
+} from './pools/selection-strategies/selection-strategies-types.js'
+import type { KillBehavior } from './worker/worker-options.js'
+import { type IWorker, type WorkerType, WorkerTypes } from './pools/worker.js'
+import type { IPool } from './pools/pool.js'
 
 /**
  * Default task name.
@@ -22,23 +23,6 @@ export const EMPTY_FUNCTION: () => void = Object.freeze(() => {
   /* Intentionally empty */
 })
 
-/**
- * Gets default worker choice strategy options.
- *
- * @param retries - The number of worker choice retries.
- * @returns The default worker choice strategy options.
- */
-const getDefaultInternalWorkerChoiceStrategyOptions = (
-  retries: number
-): InternalWorkerChoiceStrategyOptions => {
-  return {
-    retries,
-    runTime: { median: false },
-    waitTime: { median: false },
-    elu: { median: false }
-  }
-}
-
 /**
  * Default measurement statistics requirements.
  */
@@ -282,22 +266,40 @@ export const once = <T, A extends any[], R>(
   }
 }
 
-const clone = <T extends object>(object: T): T => {
-  return JSON.parse(JSON.stringify(object)) as T
+export const getWorkerChoiceStrategyRetries = <
+  Worker extends IWorker,
+  Data,
+  Response
+>(
+    pool: IPool<Worker, Data, Response>,
+    opts?: WorkerChoiceStrategyOptions
+  ): number => {
+  return (
+    pool.info.maxSize +
+    Object.keys(opts?.weights ?? getDefaultWeights(pool.info.maxSize)).length
+  )
 }
 
-export const buildInternalWorkerChoiceStrategyOptions = (
-  poolMaxSize: number,
-  opts?: InternalWorkerChoiceStrategyOptions
-): InternalWorkerChoiceStrategyOptions => {
+const clone = <T>(object: T): T => {
+  return structuredClone<T>(object)
+}
+
+export const buildWorkerChoiceStrategyOptions = <
+  Worker extends IWorker,
+  Data,
+  Response
+>(
+    pool: IPool<Worker, Data, Response>,
+    opts?: WorkerChoiceStrategyOptions
+  ): WorkerChoiceStrategyOptions => {
   opts = clone(opts ?? {})
-  if (opts?.weights == null) {
-    opts.weights = getDefaultWeights(poolMaxSize)
-  }
+  opts.weights = opts?.weights ?? getDefaultWeights(pool.info.maxSize)
   return {
-    ...getDefaultInternalWorkerChoiceStrategyOptions(
-      poolMaxSize + Object.keys(opts.weights).length
-    ),
+    ...{
+      runTime: { median: false },
+      waitTime: { median: false },
+      elu: { median: false }
+    },
     ...opts
   }
 }