repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WRR: Fix worker choice initial runtime value on each round
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
weighted-round-robin-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
index c2f85145c44dfd4d3eee48fba3fd9d6c64db94d0..4b1e5382af333d2edb59eb5ae41d1c5132f6ccb3 100644
(file)
--- a/
src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@
-30,10
+30,6
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
runTime: true
}
runTime: true
}
- /**
- * Worker index where the previous task was submitted.
- */
- private previousWorkerIndex: number = 0
/**
* Worker index where the current task will be submitted.
*/
/**
* Worker index where the current task will be submitted.
*/
@@
-63,7
+59,6
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public reset (): boolean {
/** @inheritDoc */
public reset (): boolean {
- this.previousWorkerIndex = 0
this.currentWorkerIndex = 0
this.workersTaskRunTime.clear()
this.initWorkersTaskRunTime()
this.currentWorkerIndex = 0
this.workersTaskRunTime.clear()
this.initWorkersTaskRunTime()
@@
-72,40
+67,37
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): Worker {
/** @inheritDoc */
public choose (): Worker {
- const c
urrent
Worker = this.pool.workers[this.currentWorkerIndex]
+ const c
hosen
Worker = this.pool.workers[this.currentWorkerIndex]
if (
this.isDynamicPool === true &&
if (
this.isDynamicPool === true &&
- this.workersTaskRunTime.has(c
urrent
Worker) === false
+ this.workersTaskRunTime.has(c
hosen
Worker) === false
) {
) {
- this.initWorkerTaskRunTime(c
urrent
Worker)
+ this.initWorkerTaskRunTime(c
hosen
Worker)
}
}
- const worker
Virtual
TaskRunTime =
- this.
getWorkerVirtualTaskRunTime(currentWorker)
?? 0
+ const workerTaskRunTime =
+ this.
workersTaskRunTime.get(chosenWorker)?.runTime
?? 0
const workerTaskWeight =
const workerTaskWeight =
- this.workersTaskRunTime.get(c
urrent
Worker)?.weight ??
+ this.workersTaskRunTime.get(c
hosen
Worker)?.weight ??
this.defaultWorkerWeight
this.defaultWorkerWeight
- if (this.currentWorkerIndex === this.previousWorkerIndex) {
- const workerTaskRunTime =
- (this.workersTaskRunTime.get(currentWorker)?.runTime ?? 0) +
- workerVirtualTaskRunTime
+ if (workerTaskRunTime < workerTaskWeight) {
this.setWorkerTaskRunTime(
this.setWorkerTaskRunTime(
- c
urrent
Worker,
+ c
hosen
Worker,
workerTaskWeight,
workerTaskWeight,
- workerTaskRunTime
+ workerTaskRunTime +
+ (this.getWorkerVirtualTaskRunTime(chosenWorker) ?? 0)
)
} else {
)
} else {
- this.setWorkerTaskRunTime(currentWorker, workerTaskWeight, 0)
- }
- if (workerVirtualTaskRunTime < workerTaskWeight) {
- this.previousWorkerIndex = this.currentWorkerIndex
- } else {
- this.previousWorkerIndex = this.currentWorkerIndex
this.currentWorkerIndex =
this.currentWorkerIndex =
- this.
pool.workers.length - 1 === this.currentWorkerIndex
+ this.
currentWorkerIndex === this.pool.workers.length - 1
? 0
: this.currentWorkerIndex + 1
? 0
: this.currentWorkerIndex + 1
+ this.setWorkerTaskRunTime(
+ this.pool.workers[this.currentWorkerIndex],
+ workerTaskWeight,
+ 0
+ )
}
}
- return
this.pool.workers[this.currentWorkerIndex]
+ return
chosenWorker
}
private initWorkersTaskRunTime (): void {
}
private initWorkersTaskRunTime (): void {
@@
-137,9
+129,9
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
let cpusCycleTimeWeight = 0
for (const cpu of cpus()) {
// CPU estimated cycle time
let cpusCycleTimeWeight = 0
for (const cpu of cpus()) {
// CPU estimated cycle time
- const numberOfDigit = cpu.speed.toString().length - 1
- const cpuCycleTime = 1 / (cpu.speed / Math.pow(10, numberOfDigit))
- cpusCycleTimeWeight += cpuCycleTime * Math.pow(10, numberOfDigit)
+ const numberOfDigit
s
= cpu.speed.toString().length - 1
+ const cpuCycleTime = 1 / (cpu.speed / Math.pow(10, numberOfDigit
s
))
+ cpusCycleTimeWeight += cpuCycleTime * Math.pow(10, numberOfDigit
s
)
}
return Math.round(cpusCycleTimeWeight / cpus().length)
}
}
return Math.round(cpusCycleTimeWeight / cpus().length)
}