From 1d6d93ce602a45fe649335f4933c698573715df1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 16 Jun 2023 21:42:49 +0200 Subject: [PATCH] refactor: comment out dead code in worker choice strategies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- README.md | 2 - .../abstract-worker-choice-strategy.ts | 118 +++++++++--------- 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 94b71d75..cb7a1ad9 100644 --- a/README.md +++ b/README.md @@ -293,8 +293,6 @@ See [CONTRIBUTING](CONTRIBUTING.md) guidelines. ## Team - - **Creator/Owner:** - [**Alessandro Pio Ardizio**](https://github.com/pioardi) diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index feb7d957..b9f6e721 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -21,10 +21,10 @@ export abstract class AbstractWorkerChoiceStrategy< Data = unknown, Response = unknown > implements IWorkerChoiceStrategy { - /** - * Toggles finding the last free worker node key. - */ - private toggleFindLastFreeWorkerNodeKey: boolean = false + // /** + // * Toggles finding the last free worker node key. + // */ + // private toggleFindLastFreeWorkerNodeKey: boolean = false /** * Id of the next worker node. @@ -138,19 +138,19 @@ export abstract class AbstractWorkerChoiceStrategy< this.opts = opts } - /** - * Finds a free worker node key. - * - * @returns The free worker node key or `-1` if there is no free worker node. - */ - protected findFreeWorkerNodeKey (): number { - if (this.toggleFindLastFreeWorkerNodeKey) { - this.toggleFindLastFreeWorkerNodeKey = false - return this.findLastFreeWorkerNodeKey() - } - this.toggleFindLastFreeWorkerNodeKey = true - return this.findFirstFreeWorkerNodeKey() - } + // /** + // * Finds a free worker node key. + // * + // * @returns The free worker node key or `-1` if there is no free worker node. + // */ + // protected findFreeWorkerNodeKey (): number { + // if (this.toggleFindLastFreeWorkerNodeKey) { + // this.toggleFindLastFreeWorkerNodeKey = false + // return this.findLastFreeWorkerNodeKey() + // } + // this.toggleFindLastFreeWorkerNodeKey = true + // return this.findFirstFreeWorkerNodeKey() + // } /** * Gets the worker task runtime. @@ -205,46 +205,46 @@ export abstract class AbstractWorkerChoiceStrategy< return Math.round(cpusCycleTimeWeight / cpus().length) } - /** - * Finds the first free worker node key based on the number of tasks the worker has applied. - * - * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. - * - * If no free worker is found, `-1` is returned. - * - * @returns A worker node key if there is one, `-1` otherwise. - */ - private findFirstFreeWorkerNodeKey (): number { - return this.pool.workerNodes.findIndex(workerNode => { - return workerNode.workerUsage.tasks.executing === 0 - }) - } - - /** - * Finds the last free worker node key based on the number of tasks the worker has applied. - * - * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. - * - * If no free worker is found, `-1` is returned. - * - * @returns A worker node key if there is one, `-1` otherwise. - */ - private findLastFreeWorkerNodeKey (): number { - // It requires node >= 18.0.0: - // return this.workerNodes.findLastIndex(workerNode => { - // return workerNode.workerUsage.tasks.executing === 0 - // }) - for ( - let workerNodeKey = this.pool.workerNodes.length - 1; - workerNodeKey >= 0; - workerNodeKey-- - ) { - if ( - this.pool.workerNodes[workerNodeKey].workerUsage.tasks.executing === 0 - ) { - return workerNodeKey - } - } - return -1 - } + // /** + // * Finds the first free worker node key based on the number of tasks the worker has applied. + // * + // * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. + // * + // * If no free worker is found, `-1` is returned. + // * + // * @returns A worker node key if there is one, `-1` otherwise. + // */ + // private findFirstFreeWorkerNodeKey (): number { + // return this.pool.workerNodes.findIndex(workerNode => { + // return workerNode.workerUsage.tasks.executing === 0 + // }) + // } + + // /** + // * Finds the last free worker node key based on the number of tasks the worker has applied. + // * + // * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. + // * + // * If no free worker is found, `-1` is returned. + // * + // * @returns A worker node key if there is one, `-1` otherwise. + // */ + // private findLastFreeWorkerNodeKey (): number { + // // It requires node >= 18.0.0: + // // return this.workerNodes.findLastIndex(workerNode => { + // // return workerNode.workerUsage.tasks.executing === 0 + // // }) + // for ( + // let workerNodeKey = this.pool.workerNodes.length - 1; + // workerNodeKey >= 0; + // workerNodeKey-- + // ) { + // if ( + // this.pool.workerNodes[workerNodeKey].workerUsage.tasks.executing === 0 + // ) { + // return workerNodeKey + // } + // } + // return -1 + // } } -- 2.34.1