repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: update benchmarks vs. external pools
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
least-busy-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
index 6e413825d666025022acf6018dfe47c77e8345fe..58fbb51ecfd5012db79b6bc3cad5a714ba93d733 100644
(file)
--- a/
src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@
-4,7
+4,7
@@
import type { IWorker } from '../worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
-
RequiredStatistic
s,
+
TaskStatisticsRequirement
s,
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
@@
-23,13
+23,22
@@
export class LeastBusyWorkerChoiceStrategy<
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
/** @inheritDoc */
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
/** @inheritDoc */
- public readonly requiredStatistics: RequiredStatistics = {
- runTime: true,
- avgRunTime: false,
- medRunTime: false,
- waitTime: false,
- avgWaitTime: false,
- medWaitTime: false
+ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
+ runTime: {
+ aggregate: true,
+ average: false,
+ median: false
+ },
+ waitTime: {
+ aggregate: true,
+ average: false,
+ median: false
+ },
+ elu: {
+ aggregate: false,
+ average: false,
+ median: false
+ }
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-38,7
+47,7
@@
export class LeastBusyWorkerChoiceStrategy<
opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
) {
super(pool, opts)
opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
) {
super(pool, opts)
- this.set
RequiredStatistic
s(this.opts)
+ this.set
TaskStatisticsRequirement
s(this.opts)
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-53,18
+62,16
@@
export class LeastBusyWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number {
/** @inheritDoc */
public choose (): number {
- const freeWorkerNodeKey = this.findFreeWorkerNodeKey()
- if (freeWorkerNodeKey !== -1) {
- return freeWorkerNodeKey
- }
- let minRunTime = Infinity
+ let minTime = Infinity
let leastBusyWorkerNodeKey!: number
for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
let leastBusyWorkerNodeKey!: number
for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
- const workerRunTime = workerNode.tasksUsage.runTime
- if (workerRunTime === 0) {
+ const workerTime =
+ workerNode.workerUsage.runTime.aggregate +
+ workerNode.workerUsage.waitTime.aggregate
+ if (workerTime === 0) {
return workerNodeKey
return workerNodeKey
- } else if (worker
RunTime < minRu
nTime) {
- min
RunTime = workerRun
Time
+ } else if (worker
Time < mi
nTime) {
+ min
Time = worker
Time
leastBusyWorkerNodeKey = workerNodeKey
}
}
leastBusyWorkerNodeKey = workerNodeKey
}
}