X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fworker.ts;h=c92478d4a8436512853384f65ccce026f6528a19;hb=bb4e9c3d36509745767905e4577d000087a23288;hp=35d2c0abaa331ecad6e9a0404deaa90c00ef7d4c;hpb=802983837716dc38305c13f905a1977688365293;p=poolifier.git

diff --git a/src/pools/worker.ts b/src/pools/worker.ts
index 35d2c0ab..c92478d4 100644
--- a/src/pools/worker.ts
+++ b/src/pools/worker.ts
@@ -6,7 +6,7 @@ import type { Queue } from '../queue'
  */
 export type MessageHandler<Worker extends IWorker> = (
   this: Worker,
-  m: unknown
+  message: unknown
 ) => void
 
 /**
@@ -14,7 +14,7 @@ export type MessageHandler<Worker extends IWorker> = (
  */
 export type ErrorHandler<Worker extends IWorker> = (
   this: Worker,
-  e: Error
+  error: Error
 ) => void
 
 /**
@@ -27,13 +27,13 @@ export type OnlineHandler<Worker extends IWorker> = (this: Worker) => void
  */
 export type ExitHandler<Worker extends IWorker> = (
   this: Worker,
-  code: number
+  exitCode: number
 ) => void
 
 /**
  * Message object that is passed as a task between main worker and worker.
  *
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
  * @internal
  */
 export interface Task<Data = unknown> {
@@ -46,9 +46,9 @@ export interface Task<Data = unknown> {
    */
   readonly data?: Data
   /**
-   * Submission timestamp.
+   * Timestamp.
    */
-  readonly submissionTimestamp?: number
+  readonly timestamp?: number
   /**
    * Message UUID.
    */
@@ -56,61 +56,117 @@ export interface Task<Data = unknown> {
 }
 
 /**
- * Worker tasks usage statistics.
+ * Measurement statistics.
  *
  * @internal
  */
-export interface TasksUsage {
+export interface MeasurementStatistics {
   /**
-   * Number of tasks executed.
+   * Measurement aggregate.
    */
-  run: number
+  aggregate: 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>
+}
+
+/**
+ * Event loop utilization measurement statistics.
+ *
+ * @internal
+ */
+export interface EventLoopUtilizationMeasurementStatistics {
+  idle: MeasurementStatistics
+  active: MeasurementStatistics
+  utilization: number
+}
+
+/**
+ * Task statistics.
+ *
+ * @internal
+ */
+export interface TaskStatistics {
+  /**
+   * Number of executed tasks.
+   */
+  executed: number
+  /**
+   * Number of executing tasks.
+   */
+  executing: number
+  /**
+   * Number of queued tasks.
+   */
+  readonly queued: number
   /**
-   * Average tasks runtime.
+   * Maximum number of queued tasks.
    */
-  avgRunTime: number
+  readonly maxQueued: number
   /**
-   * Median tasks runtime.
+   * Number of failed tasks.
    */
-  medRunTime: number
+  failed: number
+}
+
+/**
+ * Worker information.
+ *
+ * @internal
+ */
+export interface WorkerInfo {
+  /**
+   * Worker Id.
+   */
+  id: number | undefined
   /**
-   * Tasks wait time.
+   * Started flag.
    */
-  waitTime: number
+  started: boolean
+}
+
+/**
+ * Worker usage statistics.
+ *
+ * @internal
+ */
+export interface WorkerUsage {
   /**
-   * Tasks wait time history.
+   * Tasks statistics.
    */
-  waitTimeHistory: CircularArray<number>
+  tasks: TaskStatistics
   /**
-   * Average tasks wait time.
+   * Tasks runtime statistics.
    */
-  avgWaitTime: number
+  runTime: MeasurementStatistics
   /**
-   * Median tasks wait time.
+   * Tasks wait time statistics.
    */
-  medWaitTime: number
+  waitTime: MeasurementStatistics
   /**
-   * Number of tasks errored.
+   * Tasks event loop utilization statistics.
    */
-  error: number
+  elu: EventLoopUtilizationMeasurementStatistics
 }
 
 /**
  * Worker interface.
  */
 export interface IWorker {
+  /**
+   * Worker Id.
+   */
+  id?: number
+  threadId?: number
   /**
    * Register an event listener.
    *
@@ -134,7 +190,7 @@ export interface IWorker {
  * Worker node interface.
  *
  * @typeParam Worker - Type of worker.
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
  * @internal
  */
 export interface WorkerNode<Worker extends IWorker, Data = unknown> {
@@ -143,9 +199,13 @@ export interface WorkerNode<Worker extends IWorker, Data = unknown> {
    */
   readonly worker: Worker
   /**
-   * Worker node tasks usage statistics.
+   * Worker node worker info.
+   */
+  info: WorkerInfo
+  /**
+   * Worker node worker usage statistics.
    */
-  tasksUsage: TasksUsage
+  usage: WorkerUsage
   /**
    * Worker node tasks queue.
    */