From 0527b6db895355140ed6fa2f740caab3a41b2f9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 10 Apr 2023 06:15:38 +0200 Subject: [PATCH] refactor: cleanup pool busyness checks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/pools/abstract-pool.ts | 6 +----- src/pools/cluster/dynamic.ts | 2 +- src/pools/thread/dynamic.ts | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts index 1a1a89fb..fea4847d 100644 --- a/src/pools/abstract-pool.ts +++ b/src/pools/abstract-pool.ts @@ -336,11 +336,7 @@ export abstract class AbstractPool< */ protected chooseWorkerNode (): [number, WorkerNode] { let workerNodeKey: number - if ( - this.type === PoolType.DYNAMIC && - !this.full && - this.findFreeWorkerNodeKey() === -1 - ) { + if (this.type === PoolType.DYNAMIC && !this.full && this.internalBusy()) { const workerCreated = this.createAndSetupWorker() this.registerWorkerMessageListener(workerCreated, message => { if ( diff --git a/src/pools/cluster/dynamic.ts b/src/pools/cluster/dynamic.ts index 9f9abb01..89180f1f 100644 --- a/src/pools/cluster/dynamic.ts +++ b/src/pools/cluster/dynamic.ts @@ -46,6 +46,6 @@ export class DynamicClusterPool< /** @inheritDoc */ public get busy (): boolean { - return this.full && this.findFreeWorkerNodeKey() === -1 + return this.full && this.internalBusy() } } diff --git a/src/pools/thread/dynamic.ts b/src/pools/thread/dynamic.ts index e1565d00..05b61684 100644 --- a/src/pools/thread/dynamic.ts +++ b/src/pools/thread/dynamic.ts @@ -47,6 +47,6 @@ export class DynamicThreadPool< /** @inheritDoc */ public get busy (): boolean { - return this.full && this.findFreeWorkerNodeKey() === -1 + return this.full && this.internalBusy() } } -- 2.34.1