repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: initialize attribute in the constructor
[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 ed8690918f6177656020d84a915f11de85023aca..2b7cd9420d209effcf8fc0b251c805770c30c0b2 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
@@
-1,13
+1,13
@@
import { cpus } from 'os'
import { cpus } from 'os'
-import type { AbstractPoolWorker } from '../abstract-pool-worker'
import type { IPoolInternal } from '../pool-internal'
import type { IPoolInternal } from '../pool-internal'
+import type { IPoolWorker } from '../pool-worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type { RequiredStatistics } from './selection-strategies-types'
/**
* Virtual task runtime.
*/
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type { RequiredStatistics } from './selection-strategies-types'
/**
* Virtual task runtime.
*/
-
type TaskRunTime =
{
+
interface TaskRunTime
{
weight: number
runTime: number
}
weight: number
runTime: number
}
@@
-16,24
+16,20
@@
type TaskRunTime = {
* Selects the next worker with a weighted round robin scheduling algorithm.
* Loosely modeled after the weighted round robin queueing algorithm: https://en.wikipedia.org/wiki/Weighted_round_robin.
*
* Selects the next worker with a weighted round robin scheduling algorithm.
* Loosely modeled after the weighted round robin queueing algorithm: https://en.wikipedia.org/wiki/Weighted_round_robin.
*
- * @t
emplate Worker
Type of worker which manages the strategy.
- * @t
emplate Data
Type of data sent to the worker. This can only be serializable data.
- * @t
emplate Response
Type of response of execution. This can only be serializable data.
+ * @t
ypeParam Worker -
Type of worker which manages the strategy.
+ * @t
ypeParam Data -
Type of data sent to the worker. This can only be serializable data.
+ * @t
ypeParam Response -
Type of response of execution. This can only be serializable data.
*/
export class WeightedRoundRobinWorkerChoiceStrategy<
*/
export class WeightedRoundRobinWorkerChoiceStrategy<
- Worker extends
Abstract
PoolWorker,
+ Worker extends
I
PoolWorker,
Data,
Response
> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
Data,
Response
> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
- /**
@inheritDoc
*/
- public requiredStatistics: RequiredStatistics = {
+ /**
{@inheritDoc}
*/
+ public re
adonly re
quiredStatistics: RequiredStatistics = {
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.
*/
@@
-41,19
+37,19
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/**
* Default worker weight.
*/
/**
* Default worker weight.
*/
- private defaultWorkerWeight: number
+ private
readonly
defaultWorkerWeight: number
/**
* Per worker virtual task runtime map.
*/
/**
* Per worker virtual task runtime map.
*/
- private workersTaskRunTime: Map<Worker, TaskRunTime> = new Map<
-
Worker,
-
TaskRunTime
+ private
readonly
workersTaskRunTime: Map<Worker, TaskRunTime> = new Map<
+ Worker,
+ TaskRunTime
>()
/**
* Constructs a worker choice strategy that selects with a weighted round robin scheduling algorithm.
*
>()
/**
* Constructs a worker choice strategy that selects with a weighted round robin scheduling algorithm.
*
- * @param pool The pool instance.
+ * @param pool
-
The pool instance.
*/
public constructor (pool: IPoolInternal<Worker, Data, Response>) {
super(pool)
*/
public constructor (pool: IPoolInternal<Worker, Data, Response>) {
super(pool)
@@
-61,42
+57,44
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
this.initWorkersTaskRunTime()
}
this.initWorkersTaskRunTime()
}
- /** @inheritDoc */
+ /** {@inheritDoc} */
+ public reset (): boolean {
+ this.currentWorkerIndex = 0
+ this.workersTaskRunTime.clear()
+ this.initWorkersTaskRunTime()
+ return true
+ }
+
+ /** {@inheritDoc} */
public choose (): Worker {
public choose (): Worker {
- const currentWorker = this.pool.workers[this.currentWorkerIndex]
- if (
- this.isDynamicPool === true &&
- this.workersTaskRunTime.has(currentWorker) === false
- ) {
- this.initWorkerTaskRunTime(currentWorker)
+ const chosenWorker = this.pool.workers[this.currentWorkerIndex]
+ if (this.isDynamicPool && !this.workersTaskRunTime.has(chosenWorker)) {
+ this.initWorkerTaskRunTime(chosenWorker)
}
}
- 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 {
@@
-128,9
+126,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)
}