repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:poolifier/poolifier
[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 e26f6b8f5953dff0b3d6dc1d59469977ab264494..f678f83b9719f93c3c3defd2013dec42fea31a8d 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,11
+1,15
@@
-import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
+import {
+ DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+ 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 { IPool } from '../pool'
import type { IWorker } from '../worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
-import type {
- IWorkerChoiceStrategy,
- RequiredStatistics,
- WorkerChoiceStrategyOptions
+import {
+ type IWorkerChoiceStrategy,
+ Measurements,
+ type TaskStatisticsRequirements,
+ type WorkerChoiceStrategyOptions
} from './selection-strategies-types'
/**
} from './selection-strategies-types'
/**
@@
-13,8
+17,8
@@
import type {
* Loosely modeled after the fair queueing algorithm: https://en.wikipedia.org/wiki/Fair_queuing.
*
* @typeParam Worker - Type of worker which manages the strategy.
* Loosely modeled after the fair queueing algorithm: https://en.wikipedia.org/wiki/Fair_queuing.
*
* @typeParam Worker - Type of worker which manages the strategy.
- * @typeParam Data - Type of data sent to the worker. This can only be s
erializ
able data.
- * @typeParam Response - Type of execution response. This can only be s
erializ
able data.
+ * @typeParam Data - Type of data sent to the worker. This can only be s
tructured-clone
able data.
+ * @typeParam Response - Type of execution response. This can only be s
tructured-clone
able data.
*/
export class FairShareWorkerChoiceStrategy<
Worker extends IWorker,
*/
export class FairShareWorkerChoiceStrategy<
Worker extends IWorker,
@@
-24,10
+28,18
@@
export class FairShareWorkerChoiceStrategy<
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
/** @inheritDoc */
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
/** @inheritDoc */
- public readonly requiredStatistics: RequiredStatistics = {
- runTime: true,
- avgRunTime: true,
- medRunTime: false
+ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
+ runTime: {
+ aggregate: true,
+ average: true,
+ median: false
+ },
+ waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+ elu: {
+ aggregate: true,
+ average: true,
+ median: false
+ }
}
/**
}
/**
@@
-41,7
+53,7
@@
export class FairShareWorkerChoiceStrategy<
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 */
@@
-59,7
+71,6
@@
export class FairShareWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number {
let minWorkerVirtualTaskEndTimestamp = Infinity
/** @inheritDoc */
public choose (): number {
let minWorkerVirtualTaskEndTimestamp = Infinity
- let chosenWorkerNodeKey!: number
for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
@@
-68,10
+79,10
@@
export class FairShareWorkerChoiceStrategy<
this.workersVirtualTaskEndTimestamp[workerNodeKey]
if (workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp) {
minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
this.workersVirtualTaskEndTimestamp[workerNodeKey]
if (workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp) {
minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
-
chosenWorkerNodeKey
= workerNodeKey
+
this.nextWorkerNodeId
= workerNodeKey
}
}
}
}
- return
chosenWorkerNodeKey
+ return
this.nextWorkerNodeId
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-97,9
+108,11
@@
export class FairShareWorkerChoiceStrategy<
workerNodeKey: number,
workerVirtualTaskStartTimestamp: number
): number {
workerNodeKey: number,
workerVirtualTaskStartTimestamp: number
): number {
- return (
- workerVirtualTaskStartTimestamp + this.getWorkerTaskRunTime(workerNodeKey)
- )
+ const workerTaskRunTime =
+ this.opts.measurement === Measurements.elu
+ ? this.getWorkerTaskElu(workerNodeKey)
+ : this.getWorkerTaskRunTime(workerNodeKey)
+ return workerVirtualTaskStartTimestamp + workerTaskRunTime
}
private getWorkerVirtualTaskStartTimestamp (workerNodeKey: number): number {
}
private getWorkerVirtualTaskStartTimestamp (workerNodeKey: number): number {