sim-rs: return timestamps in f64 seconds

Author: SupernaviX

sim-rs/sim-core/src/clock/timestamp.rs

@@ -43,7 +43,7 @@ impl Serialize for Timestamp {
     where
         S: serde::Serializer,
     {
-        serializer.serialize_u128(self.0.as_nanos())
+        serializer.serialize_f32(self.0.as_secs_f32())
     }
 }
 

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

@@ -72,7 +72,7 @@ pub enum Event {
     CpuSubtaskStarted {
         task: CpuTaskId<Node>,
         subtask_id: u64,
-        #[serde(serialize_with = "duration_as_nanos")]
+        #[serde(serialize_with = "duration_as_secs")]
         duration: Duration,
     },
     TransactionGenerated {
@@ -473,6 +473,6 @@ impl EventTracker {
     }
 }
 
-fn duration_as_nanos<S: Serializer>(duration: &Duration, serializer: S) -> Result<S::Ok, S::Error> {
-    serializer.serialize_u128(duration.as_nanos())
+fn duration_as_secs<S: Serializer>(duration: &Duration, serializer: S) -> Result<S::Ok, S::Error> {
+    serializer.serialize_f32(duration.as_secs_f32())
 }

ui/src/app/api/messages/batch/route.ts

@@ -43,7 +43,7 @@ function getTimestampAtPosition(
 
         rl.on("line", (line) => {
           const message: IServerMessage = JSON.parse(line);
-          const timestamp = message.time / 1_000_000;
+          const timestamp = message.time;
           rl.close();
           resolve(timestamp);
         });
@@ -161,7 +161,7 @@ export async function GET(req: Request, res: Response) {
 
             const serializedData = {
               ...aggregatedData,
-              progress: JSON.parse(batch[batch.length - 1]).time / 1_000_000,
+              progress: JSON.parse(batch[batch.length - 1]).time,
               nodes: Array.from(aggregatedData.nodes.entries()),
               lastNodesUpdated: [...nodesUpdated],
             };

ui/src/app/api/messages/batch/utils.ts

@@ -282,7 +282,7 @@ export function getTimestampAtPosition(
 
         rl.on("line", (line) => {
           const message: IServerMessage = JSON.parse(line);
-          const timestamp = message.time / 1_000_000;
+          const timestamp = message.time;
           rl.close();
           resolve(timestamp);
         });

ui/src/app/queries.ts

@@ -75,7 +75,7 @@ export const getSetSimulationMaxTime = async (): Promise<number> => {
       reject("Could not find the last transaction.");
     } else {
       const message: IServerMessage = JSON.parse(lastLine.trim());
-      resolve(message.time / 1_000_000);
+      resolve(message.time);
     }
   });
 };

ui/src/components/Sim/modules/Slider.tsx

@@ -8,8 +8,8 @@ export const Progress: FC = () => {
 
   const percent = (aggregatedData.progress / maxTime) * 100;
 
-  const minutes = Math.floor(aggregatedData.progress / 60_000);
-  const seconds = (aggregatedData.progress / 1000 % 60).toFixed(3);
+  const minutes = Math.floor(aggregatedData.progress / 60);
+  const seconds = (aggregatedData.progress % 60).toFixed(3);
   const time = minutes ? `${minutes}m${seconds}s` : `${seconds}s`;
 
   return (