sim-rs: add wall_time_s field to events

Author: SupernaviX

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

@@ -69,6 +69,8 @@ pub enum Event {
         task_type: String,
         #[serde(serialize_with = "duration_as_secs")]
         cpu_time_s: Duration,
+        #[serde(serialize_with = "duration_as_secs")]
+        wall_time_s: Duration,
         extra: String,
     },
     CpuSubtaskStarted {
@@ -279,12 +281,14 @@ impl EventTracker {
         task_id: CpuTaskId,
         task_type: String,
         cpu_time: Duration,
+        wall_time: Duration,
         extra: String,
     ) {
         self.send(Event::CpuTaskFinished {
             task: self.to_task(task_id),
             task_type,
             cpu_time_s: cpu_time,
+            wall_time_s: wall_time,
             extra,
         });
     }

sim-rs/sim-core/src/sim/cpu.rs

@@ -3,10 +3,13 @@ use std::{
     time::Duration,
 };
 
+use crate::clock::Timestamp;
+
 struct TaskState<T> {
     task: T,
     subtasks: usize,
     cpu_time: Duration,
+    start_time: Timestamp,
 }
 
 pub struct Subtask {
@@ -34,7 +37,12 @@ impl<T> CpuTaskQueue<T> {
         }
     }
 
-    pub fn schedule_task(&mut self, task: T, durations: Vec<Duration>) -> (u64, Vec<Subtask>) {
+    pub fn schedule_task(
+        &mut self,
+        task: T,
+        durations: Vec<Duration>,
+        start_time: Timestamp,
+    ) -> (u64, Vec<Subtask>) {
         assert!(!durations.is_empty());
 
         let task_id = self.next_task_id;
@@ -45,6 +53,7 @@ impl<T> CpuTaskQueue<T> {
                 task,
                 subtasks: durations.len(),
                 cpu_time: durations.iter().sum(),
+                start_time,
             },
         );
 
@@ -69,7 +78,7 @@ impl<T> CpuTaskQueue<T> {
     pub fn complete_subtask(
         &mut self,
         subtask: Subtask,
-    ) -> (Option<(T, Duration)>, Option<Subtask>) {
+    ) -> (Option<(T, Duration, Timestamp)>, Option<Subtask>) {
         self.available_cores = self.available_cores.map(|c| c + 1);
 
         let task = self
@@ -80,7 +89,7 @@ impl<T> CpuTaskQueue<T> {
         let finished_task = if task.subtasks == 0 {
             self.tasks
                 .remove(&subtask.task_id)
-                .map(|s| (s.task, s.cpu_time))
+                .map(|s| (s.task, s.cpu_time, s.start_time))
         } else {
             None
         };

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

@@ -281,7 +281,7 @@ impl Node {
         let cpu_times = self.task_cpu_times(&task);
         let task_type = task.task_type();
         let subtask_count = cpu_times.len();
-        let (task_id, subtasks) = self.cpu.schedule_task(task, cpu_times);
+        let (task_id, subtasks) = self.cpu.schedule_task(task, cpu_times, self.clock.now());
         self.tracker.track_cpu_task_scheduled(
             CpuTaskId {
                 node: self.id,
@@ -390,10 +390,11 @@ impl Node {
                             if let Some(subtask) = next_subtask {
                                 self.start_cpu_subtask(subtask);
                             }
-                            let Some((task, cpu_time)) = finished_task else {
+                            let Some((task, cpu_time, start_time)) = finished_task else {
                                 continue;
                             };
-                            self.tracker.track_cpu_task_finished(task_id, task.task_type(), cpu_time, task.extra());
+                            let wall_time = self.clock.now() - start_time;
+                            self.tracker.track_cpu_task_finished(task_id, task.task_type(), cpu_time, wall_time, task.extra());
                             match task {
                                 CpuTask::TransactionValidated(from, tx) => self.propagate_tx(from, tx)?,
                                 CpuTask::RBBlockGenerated(block) => self.finish_generating_block(block)?,