sim-rs: replace cpu subtask end events with durations

Author: SupernaviX

sim-rs/sim-cli/src/events.rs

@@ -166,7 +166,6 @@ impl EventMonitor {
                 Event::CpuTaskScheduled { .. } => {}
                 Event::CpuTaskFinished { .. } => {}
                 Event::CpuSubtaskStarted { .. } => {}
-                Event::CpuSubtaskFinished { .. } => {}
                 Event::TransactionGenerated { id, bytes, .. } => {
                     txs.insert(id, Transaction::new(bytes, time));
                     pending_txs.insert(id);

sim-rs/sim-core/src/events.rs

@@ -1,6 +1,6 @@
-use std::{collections::BTreeMap, fmt::Display, sync::Arc};
+use std::{collections::BTreeMap, fmt::Display, sync::Arc, time::Duration};
 
-use serde::Serialize;
+use serde::{Serialize, Serializer};
 use tokio::sync::mpsc;
 use tracing::warn;
 
@@ -72,10 +72,8 @@ pub enum Event {
     CpuSubtaskStarted {
         task: CpuTaskId<Node>,
         subtask_id: u64,
-    },
-    CpuSubtaskFinished {
-        task: CpuTaskId<Node>,
-        subtask_id: u64,
+        #[serde(serialize_with = "duration_as_nanos")]
+        duration: Duration,
     },
     TransactionGenerated {
         id: TransactionId,
@@ -243,17 +241,16 @@ impl EventTracker {
         });
     }
 
-    pub fn track_cpu_subtask_started(&self, task_id: CpuTaskId, subtask_id: u64) {
+    pub fn track_cpu_subtask_started(
+        &self,
+        task_id: CpuTaskId,
+        subtask_id: u64,
+        duration: Duration,
+    ) {
         self.send(Event::CpuSubtaskStarted {
             task: self.to_task(task_id),
             subtask_id,
-        });
-    }
-
-    pub fn track_cpu_subtask_finished(&self, task_id: CpuTaskId, subtask_id: u64) {
-        self.send(Event::CpuSubtaskFinished {
-            task: self.to_task(task_id),
-            subtask_id,
+            duration,
         });
     }
 
@@ -475,3 +472,7 @@ impl EventTracker {
         }
     }
 }
+
+fn duration_as_nanos<S: Serializer>(duration: &Duration, serializer: S) -> Result<S::Ok, S::Error> {
+    serializer.serialize_u128(duration.as_nanos())
+}

sim-rs/sim-core/src/sim/node.rs

@@ -295,7 +295,7 @@ impl Node {
             index: subtask.task_id,
         };
         self.tracker
-            .track_cpu_subtask_started(task_id, subtask.subtask_id);
+            .track_cpu_subtask_started(task_id, subtask.subtask_id, subtask.duration);
         let timestamp = self.clock.now() + subtask.duration;
         self.events.push(FutureEvent(
             timestamp,
@@ -391,7 +391,6 @@ impl Node {
                         NodeEvent::MessageReceived(from, msg) => self.handle_message(from, msg)?,
                         NodeEvent::CpuSubtaskCompleted(subtask) => {
                             let task_id = CpuTaskId { node: self.id, index: subtask.task_id };
-                            self.tracker.track_cpu_subtask_finished(task_id.clone(), subtask.subtask_id);
                             let (finished_task, next_subtask) = self.cpu.complete_subtask(subtask);
                             if let Some(subtask) = next_subtask {
                                 self.start_cpu_subtask(subtask);