repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix strategies internals reset
[poolifier.git]
/
src
/
pools
/
abstract-pool.ts
diff --git
a/src/pools/abstract-pool.ts
b/src/pools/abstract-pool.ts
index e204e1241811c2c0279520706fdce39ad247e881..c4181e76dfb62bc08cb2f7fbcf86e3d131038c1e 100644
(file)
--- a/
src/pools/abstract-pool.ts
+++ b/
src/pools/abstract-pool.ts
@@
-4,10
+4,10
@@
import type {
} from '../utility-types'
import { EMPTY_FUNCTION } from '../utils'
import { isKillBehavior, KillBehaviors } from '../worker/worker-options'
} from '../utility-types'
import { EMPTY_FUNCTION } from '../utils'
import { isKillBehavior, KillBehaviors } from '../worker/worker-options'
-import type { AbstractPoolWorker } from './abstract-pool-worker'
import type { PoolOptions } from './pool'
import type { IPoolInternal, TasksUsage } from './pool-internal'
import { PoolEmitter, PoolType } from './pool-internal'
import type { PoolOptions } from './pool'
import type { IPoolInternal, TasksUsage } from './pool-internal'
import { PoolEmitter, PoolType } from './pool-internal'
+import type { IPoolWorker } from './pool-worker'
import {
WorkerChoiceStrategies,
WorkerChoiceStrategy
import {
WorkerChoiceStrategies,
WorkerChoiceStrategy
@@
-18,27
+18,22
@@
const WORKER_NOT_FOUND_TASKS_USAGE_MAP =
'Worker could not be found in worker tasks usage map'
/**
'Worker could not be found in worker tasks usage map'
/**
- * Base class
containing
some shared logic for all poolifier pools.
+ * Base class
that implements
some shared logic for all poolifier pools.
*
* @template Worker Type of worker which manages this pool.
* @template Data Type of data sent to the worker. This can only be serializable data.
* @template Response Type of response of execution. This can only be serializable data.
*/
export abstract class AbstractPool<
*
* @template Worker Type of worker which manages this pool.
* @template Data Type of data sent to the worker. This can only be serializable data.
* @template Response Type of response of execution. This can only be serializable data.
*/
export abstract class AbstractPool<
- Worker extends
Abstract
PoolWorker,
+ Worker extends
I
PoolWorker,
Data = unknown,
Response = unknown
> implements IPoolInternal<Worker, Data, Response> {
/** @inheritDoc */
public readonly workers: Worker[] = []
Data = unknown,
Response = unknown
> implements IPoolInternal<Worker, Data, Response> {
/** @inheritDoc */
public readonly workers: Worker[] = []
- /**
- * The workers tasks usage map.
- *
- * `key`: The `Worker`
- * `value`: Worker tasks usage statistics.
- */
- protected workersTasksUsage: Map<Worker, TasksUsage> = new Map<
+ /** @inheritDoc */
+ public readonly workersTasksUsage: Map<Worker, TasksUsage> = new Map<
Worker,
TasksUsage
>()
Worker,
TasksUsage
>()
@@
-135,7
+130,7
@@
export abstract class AbstractPool<
throw new Error(
'Cannot instantiate a pool without specifying the number of workers'
)
throw new Error(
'Cannot instantiate a pool without specifying the number of workers'
)
- } else if (
!Number.isSafeInteger(numberOfWorkers)
) {
+ } else if (
Number.isSafeInteger(numberOfWorkers) === false
) {
throw new Error(
'Cannot instantiate a pool with a non integer number of workers'
)
throw new Error(
'Cannot instantiate a pool with a non integer number of workers'
)
@@
-182,6
+177,9
@@
export abstract class AbstractPool<
workerChoiceStrategy: WorkerChoiceStrategy
): void {
this.opts.workerChoiceStrategy = workerChoiceStrategy
workerChoiceStrategy: WorkerChoiceStrategy
): void {
this.opts.workerChoiceStrategy = workerChoiceStrategy
+ for (const worker of this.workers) {
+ this.resetWorkerTasksUsage(worker)
+ }
this.workerChoiceStrategyContext.setWorkerChoiceStrategy(
workerChoiceStrategy
)
this.workerChoiceStrategyContext.setWorkerChoiceStrategy(
workerChoiceStrategy
)
@@
-226,7
+224,7
@@
export abstract class AbstractPool<
}
/**
}
/**
- * Shut
down
given worker.
+ * Shut
downs
given worker.
*
* @param worker A worker within `workers`.
*/
*
* @param worker A worker within `workers`.
*/
@@
-283,7
+281,7
@@
export abstract class AbstractPool<
}
/**
}
/**
- * Choose a worker for the next task.
+ * Choose
s
a worker for the next task.
*
* The default implementation uses a round robin algorithm to distribute the load.
*
*
* The default implementation uses a round robin algorithm to distribute the load.
*
@@
-294,7
+292,7
@@
export abstract class AbstractPool<
}
/**
}
/**
- * Send a message to the given worker.
+ * Send
s
a message to the given worker.
*
* @param worker The worker which should receive the message.
* @param message The message.
*
* @param worker The worker which should receive the message.
* @param message The message.
@@
-305,7
+303,7
@@
export abstract class AbstractPool<
): void
/**
): void
/**
- * Register a listener callback on a given worker.
+ * Register
s
a listener callback on a given worker.
*
* @param worker A worker.
* @param listener A message listener callback.
*
* @param worker A worker.
* @param listener A message listener callback.
@@
-355,12
+353,7
@@
export abstract class AbstractPool<
this.workers.push(worker)
// Init worker tasks usage map
this.workers.push(worker)
// Init worker tasks usage map
- this.workersTasksUsage.set(worker, {
- run: 0,
- running: 0,
- runTime: 0,
- avgRunTime: 0
- })
+ this.initWorkerTasksUsage(worker)
this.afterWorkerSetup(worker)
this.afterWorkerSetup(worker)
@@
-443,10
+436,10
@@
export abstract class AbstractPool<
}
/**
}
/**
- * Updates tasks run
time for the given worker.
+ * Updates tasks runtime for the given worker.
*
* @param worker Worker which run the task.
*
* @param worker Worker which run the task.
- * @param taskRunTime Worker task run
time.
+ * @param taskRunTime Worker task runtime.
*/
private updateWorkerTasksRunTime (
worker: Worker,
*/
private updateWorkerTasksRunTime (
worker: Worker,
@@
-457,9
+450,11
@@
export abstract class AbstractPool<
.requiredStatistics.runTime === true
) {
const tasksUsage = this.workersTasksUsage.get(worker)
.requiredStatistics.runTime === true
) {
const tasksUsage = this.workersTasksUsage.get(worker)
- if (tasksUsage !== undefined
&& tasksUsage.run !== 0
) {
+ if (tasksUsage !== undefined) {
tasksUsage.runTime += taskRunTime ?? 0
tasksUsage.runTime += taskRunTime ?? 0
- tasksUsage.avgRunTime = tasksUsage.runTime / tasksUsage.run
+ if (tasksUsage.run !== 0) {
+ tasksUsage.avgRunTime = tasksUsage.runTime / tasksUsage.run
+ }
this.workersTasksUsage.set(worker, tasksUsage)
} else {
throw new Error(WORKER_NOT_FOUND_TASKS_USAGE_MAP)
this.workersTasksUsage.set(worker, tasksUsage)
} else {
throw new Error(WORKER_NOT_FOUND_TASKS_USAGE_MAP)
@@
-467,6
+462,20
@@
export abstract class AbstractPool<
}
}
}
}
+ /**
+ * Initializes tasks usage statistics.
+ *
+ * @param worker The worker.
+ */
+ initWorkerTasksUsage (worker: Worker): void {
+ this.workersTasksUsage.set(worker, {
+ run: 0,
+ running: 0,
+ runTime: 0,
+ avgRunTime: 0
+ })
+ }
+
/**
* Removes worker tasks usage statistics.
*
/**
* Removes worker tasks usage statistics.
*
@@
-475,4
+484,14
@@
export abstract class AbstractPool<
private removeWorkerTasksUsage (worker: Worker): void {
this.workersTasksUsage.delete(worker)
}
private removeWorkerTasksUsage (worker: Worker): void {
this.workersTasksUsage.delete(worker)
}
+
+ /**
+ * Resets worker tasks usage statistics.
+ *
+ * @param worker The worker.
+ */
+ private resetWorkerTasksUsage (worker: Worker): void {
+ this.removeWorkerTasksUsage(worker)
+ this.initWorkerTasksUsage(worker)
+ }
}
}