repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: fix sonarcloud analysis
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
fair-share-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
index c2f85f18ae911f0c8e35bbca6ff11712b360dff8..f72ffb566c94345497267e1d9801e36b51f000af 100644
(file)
--- a/
src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@
-1,8
+1,11
@@
+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,
import type { IWorker } from '../worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
- RequiredStatistics
+ RequiredStatistics,
+ WorkerChoiceStrategyOptions
} from './selection-strategies-types'
/**
} from './selection-strategies-types'
/**
@@
-19,7
+22,7
@@
interface WorkerVirtualTaskTimestamp {
*
* @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 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 FairShareWorkerChoiceStrategy<
Worker extends IWorker,
*/
export class FairShareWorkerChoiceStrategy<
Worker extends IWorker,
@@
-43,6
+46,15
@@
export class FairShareWorkerChoiceStrategy<
WorkerVirtualTaskTimestamp
> = new Map<number, WorkerVirtualTaskTimestamp>()
WorkerVirtualTaskTimestamp
> = new Map<number, WorkerVirtualTaskTimestamp>()
+ /** @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 {
this.workerLastVirtualTaskTimestamp.clear()
/** @inheritDoc */
public reset (): boolean {
this.workerLastVirtualTaskTimestamp.clear()
@@
-70,7
+82,7
@@
export class FairShareWorkerChoiceStrategy<
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
const deleted = this.workerLastVirtualTaskTimestamp.delete(workerNodeKey)
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
const deleted = this.workerLastVirtualTaskTimestamp.delete(workerNodeKey)
- for (const [key, value] of this.workerLastVirtualTaskTimestamp
.entries()
) {
+ for (const [key, value] of this.workerLastVirtualTaskTimestamp) {
if (key > workerNodeKey) {
this.workerLastVirtualTaskTimestamp.set(key - 1, value)
}
if (key > workerNodeKey) {
this.workerLastVirtualTaskTimestamp.set(key - 1, value)
}
@@
-88,11
+100,12
@@
export class FairShareWorkerChoiceStrategy<
performance.now(),
this.workerLastVirtualTaskTimestamp.get(workerNodeKey)?.end ?? -Infinity
)
performance.now(),
this.workerLastVirtualTaskTimestamp.get(workerNodeKey)?.end ?? -Infinity
)
+ const workerVirtualTaskTRunTime = this.requiredStatistics.medRunTime
+ ? this.pool.workerNodes[workerNodeKey].tasksUsage.medRunTime
+ : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime
this.workerLastVirtualTaskTimestamp.set(workerNodeKey, {
start: workerVirtualTaskStartTimestamp,
this.workerLastVirtualTaskTimestamp.set(workerNodeKey, {
start: workerVirtualTaskStartTimestamp,
- end:
- workerVirtualTaskStartTimestamp +
- (this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime ?? 0)
+ end: workerVirtualTaskStartTimestamp + (workerVirtualTaskTRunTime ?? 0)
})
}
}
})
}
}