From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Sat, 1 Apr 2023 20:16:31 +0000 (+0200)
Subject: perf: only check worker status when necessary
X-Git-Tag: v2.4.0-0~23
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=a9d9ea34ae4621d0babc235b10614c7c8c37d88b;hp=d2c1b9b8013ca6ab5a7d3a87dea1cc643a2efbc9;p=poolifier.git

perf: only check worker status when necessary

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

diff --git a/README.md b/README.md
index bfb47a78..7087efa1 100644
--- a/README.md
+++ b/README.md
@@ -203,7 +203,7 @@ This method will call the terminate method on each worker.
 - `async` - true/false, true if your function contains async code pieces, else false
 - `killBehavior` - Dictates if your async unit (worker/process) will be deleted in case that a task is active on it.  
   **KillBehaviors.SOFT**: If `currentTime - lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker **won't** be deleted.  
-  **KillBehaviors.HARD**: If `lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.  
+  **KillBehaviors.HARD**: If `currentTime - lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.  
   This option only apply to the newly created workers.  
   Default: `KillBehaviors.SOFT`
 
diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts
index 6531d661..122e9fa5 100644
--- a/src/pools/abstract-pool.ts
+++ b/src/pools/abstract-pool.ts
@@ -105,7 +105,7 @@ export abstract class AbstractPool<
             this.getWorkerRunningTasks(workerCreated) === 0
           ) {
             // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime)
-            void (this.destroyWorker(workerCreated) as Promise<void>)
+            void this.destroyWorker(workerCreated)
           }
         })
         return workerCreated
diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index 3a81e0f8..c71ff297 100644
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -3,7 +3,11 @@ import type { Worker } from 'cluster'
 import type { MessagePort } from 'worker_threads'
 import type { MessageValue } from '../utility-types'
 import { EMPTY_FUNCTION } from '../utils'
-import type { KillBehavior, WorkerOptions } from './worker-options'
+import {
+  isKillBehavior,
+  type KillBehavior,
+  type WorkerOptions
+} from './worker-options'
 import { KillBehaviors } from './worker-options'
 
 const DEFAULT_MAX_INACTIVE_TIME = 60000
@@ -24,7 +28,7 @@ export abstract class AbstractWorker<
   /**
    * Timestamp of the last task processed by this worker.
    */
-  protected lastTaskTimestamp: number
+  protected lastTaskTimestamp!: number
   /**
    * Handler Id of the `aliveInterval` worker alive check.
    */
@@ -63,9 +67,8 @@ export abstract class AbstractWorker<
     this.opts = opts
     this.checkFunctionInput(fn)
     this.checkWorkerOptions(this.opts)
-    this.lastTaskTimestamp = Date.now()
-    // Keep the worker active
-    if (!isMain) {
+    if (!isMain && isKillBehavior(KillBehaviors.HARD, this.opts.killBehavior)) {
+      this.lastTaskTimestamp = Date.now()
       this.aliveInterval = setInterval(
         this.checkAlive.bind(this),
         (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2
@@ -179,7 +182,8 @@ export abstract class AbstractWorker<
       const err = this.handleError(e as Error)
       this.sendToMainWorker({ error: err, id: value.id })
     } finally {
-      this.lastTaskTimestamp = Date.now()
+      isKillBehavior(KillBehaviors.HARD, this.opts.killBehavior) &&
+        (this.lastTaskTimestamp = Date.now())
     }
   }
 
@@ -205,7 +209,8 @@ export abstract class AbstractWorker<
         this.sendToMainWorker({ error: err, id: value.id })
       })
       .finally(() => {
-        this.lastTaskTimestamp = Date.now()
+        isKillBehavior(KillBehaviors.HARD, this.opts.killBehavior) &&
+          (this.lastTaskTimestamp = Date.now())
       })
       .catch(EMPTY_FUNCTION)
   }
diff --git a/src/worker/worker-options.ts b/src/worker/worker-options.ts
index 290914f1..4e5a3d07 100644
--- a/src/worker/worker-options.ts
+++ b/src/worker/worker-options.ts
@@ -7,7 +7,7 @@ export const KillBehaviors = Object.freeze({
    */
   SOFT: 'SOFT',
   /**
-   * If `lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.
+   * If `currentTime - lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.
    */
   HARD: 'HARD'
 } as const)
@@ -59,7 +59,7 @@ export interface WorkerOptions {
    * `killBehavior` dictates if your async unit (worker/process) will be deleted in case that a task is active on it.
    *
    * - SOFT: If `currentTime - lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker **won't** be deleted.
-   * - HARD: If `lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.
+   * - HARD: If `currentTime - lastActiveTime` is greater than `maxInactiveTime` but a task is still running, then the worker will be deleted.
    *
    * This option only apply to the newly created workers.
    *