repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: fix fair share algorithm implementation
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
less-busy-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
index 1d8bbaab5e8900af0187f0b938ab7c57b6d873b1..40a3f649b2116eec3f25b4b07347a8c5134b2e77 100644
(file)
--- a/
src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/less-busy-worker-choice-strategy.ts
@@
-1,8
+1,11
@@
-import type { IPoolWorker } from '../pool-worker'
+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 { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
- RequiredStatistics
+ RequiredStatistics,
+ WorkerChoiceStrategyOptions
} from './selection-strategies-types'
/**
} from './selection-strategies-types'
/**
@@
-10,48
+13,63
@@
import type {
*
* @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 LessBusyWorkerChoiceStrategy<
*/
export class LessBusyWorkerChoiceStrategy<
- Worker extends I
Pool
Worker,
- Data,
- Response
+ Worker extends IWorker,
+ Data
= unknown
,
+ Response
= unknown
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
- /**
{@inheritDoc}
*/
+ /**
@inheritDoc
*/
public readonly requiredStatistics: RequiredStatistics = {
runTime: true,
public readonly requiredStatistics: RequiredStatistics = {
runTime: true,
- avgRunTime: false
+ avgRunTime: false,
+ medRunTime: false
}
}
- /** {@inheritDoc} */
+ /** @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 {
return true
}
public reset (): boolean {
return true
}
- /** {@inheritDoc} */
+ /** @inheritDoc */
+ public update (): boolean {
+ return true
+ }
+
+ /** @inheritDoc */
public choose (): number {
public choose (): number {
- const freeWorker
Key = this.pool.findFreeWorker
Key()
- if (freeWorkerKey !== -1) {
- return freeWorkerKey
+ const freeWorker
NodeKey = this.findFreeWorkerNode
Key()
+ if (freeWorker
Node
Key !== -1) {
+ return freeWorker
Node
Key
}
let minRunTime = Infinity
}
let minRunTime = Infinity
- let lessBusyWorkerKey!: number
- for (const [
index, workerItem] of this.pool.worker
s.entries()) {
- const workerRunTime = worker
Item
.tasksUsage.runTime
+ let lessBusyWorker
Node
Key!: number
+ for (const [
workerNodeKey, workerNode] of this.pool.workerNode
s.entries()) {
+ const workerRunTime = worker
Node
.tasksUsage.runTime
if (workerRunTime === 0) {
if (workerRunTime === 0) {
- return
index
+ return
workerNodeKey
} else if (workerRunTime < minRunTime) {
minRunTime = workerRunTime
} else if (workerRunTime < minRunTime) {
minRunTime = workerRunTime
- lessBusyWorker
Key = index
+ lessBusyWorker
NodeKey = workerNodeKey
}
}
}
}
- return lessBusyWorkerKey
+ return lessBusyWorker
Node
Key
}
}
- /**
{@inheritDoc}
*/
- public remove (
workerKey: number
): boolean {
+ /**
@inheritDoc
*/
+ public remove (): boolean {
return true
}
}
return true
}
}