Merge branch 'master' into elu-strategy

[poolifier.git] / src / pools / worker.ts

diff --git a/src/pools/worker.ts b/src/pools/worker.ts
index d10a27c9171c978ce44e7b9f6a1d2a9fb66131db..94f0ff73043d3d4eede636c9bcae5d0f21ee82e8 100644 (file)
--- a/src/pools/worker.ts
+++ b/src/pools/worker.ts
@@ -47,9 +47,9 @@ export interface Task<Data = unknown> {
    */
   readonly data?: Data
   /**
-   * Submission timestamp.
+   * Timestamp.
    */
-  readonly submissionTimestamp?: number
+  readonly timestamp?: number
   /**
    * Message UUID.
    */
@@ -57,55 +57,71 @@ export interface Task<Data = unknown> {
 }
 
 /**
- * Worker tasks usage statistics.
+ * Measurement statistics.
  *
  * @internal
  */
-export interface TasksUsage {
+export interface MeasurementStatistics {
   /**
-   * Number of tasks executed.
+   * Measurement aggregation.
    */
-  ran: number
+  aggregation: number
   /**
-   * Number of tasks running.
+   * Measurement average.
    */
-  running: number
+  average: number
   /**
-   * Tasks runtime.
+   * Measurement median.
    */
-  runTime: number
+  median: number
   /**
-   * Tasks runtime history.
+   * Measurement history.
    */
-  runTimeHistory: CircularArray<number>
+  history: CircularArray<number>
+}
+
+/**
+ * Task statistics.
+ *
+ * @internal
+ */
+export interface TaskStatistics {
   /**
-   * Average tasks runtime.
+   * Number of executed tasks.
    */
-  avgRunTime: number
+  executed: number
   /**
-   * Median tasks runtime.
+   * Number of executing tasks.
    */
-  medRunTime: number
+  executing: number
   /**
-   * Tasks wait time.
+   * Number of queued tasks.
    */
-  waitTime: number
+  readonly queued: number
   /**
-   * Tasks wait time history.
+   * Number of failed tasks.
    */
-  waitTimeHistory: CircularArray<number>
+  failed: number
+}
+
+/**
+ * Worker usage statistics.
+ *
+ * @internal
+ */
+export interface WorkerUsage {
   /**
-   * Average tasks wait time.
+   * Tasks statistics.
    */
-  avgWaitTime: number
+  tasks: TaskStatistics
   /**
-   * Median tasks wait time.
+   * Tasks runtime statistics.
    */
-  medWaitTime: number
+  runTime: MeasurementStatistics
   /**
-   * Number of tasks errored.
+   * Tasks wait time statistics.
    */
-  error: number
+  waitTime: MeasurementStatistics
   /**
    * Event loop utilization.
    */
@@ -148,9 +164,9 @@ export interface WorkerNode<Worker extends IWorker, Data = unknown> {
    */
   readonly worker: Worker
   /**
-   * Worker node tasks usage statistics.
+   * Worker node worker usage statistics.
    */
-  tasksUsage: TasksUsage
+  workerUsage: WorkerUsage
   /**
    * Worker node tasks queue.
    */