From e2ab9345c2c513ee223297cc62eba3e7594c40bc Mon Sep 17 00:00:00 2001
From: Youngjoon Lee <5462944+youngjoon-lee@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:56:57 +0900
Subject: [PATCH] add durations.csv

---
 mixnet-rs/ordering/src/iteration.rs |  5 ++++-
 mixnet-rs/ordering/src/main.rs      | 24 +++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/mixnet-rs/ordering/src/iteration.rs b/mixnet-rs/ordering/src/iteration.rs
index 5f22f91..e6a9eee 100644
--- a/mixnet-rs/ordering/src/iteration.rs
+++ b/mixnet-rs/ordering/src/iteration.rs
@@ -22,7 +22,7 @@ pub fn run_iteration(
     out_queue_data_msg_counts_path: &str,
     out_ordering_coeff_path: &str,
     out_topology_path: &str,
-) {
+) -> f32 {
     // Ensure that all output files do not exist
     for path in &[
         out_latency_path,
@@ -204,6 +204,8 @@ pub fn run_iteration(
             save_ordering_coefficients(&coeffs, out_ordering_coeff_path);
         }
     }
+
+    vtime
 }
 
 fn build_striped_network(paramset: &ParamSet, seed: u64) -> (Vec<Node>, Vec<Vec<NodeId>>) {
@@ -376,6 +378,7 @@ fn new_queue_data_msg_counts_writer(path: &str, mixnodes: &[Node]) -> Writer<Fil
             });
         });
     writer.write_record(header).unwrap();
+    writer.flush().unwrap();
     writer
 }
 
diff --git a/mixnet-rs/ordering/src/main.rs b/mixnet-rs/ordering/src/main.rs
index f411313..0fd9f8e 100644
--- a/mixnet-rs/ordering/src/main.rs
+++ b/mixnet-rs/ordering/src/main.rs
@@ -70,11 +70,19 @@ fn main() {
         std::fs::create_dir_all(paramset_dir.as_str()).unwrap();
         save_paramset_info(&paramset, format!("{paramset_dir}/paramset.csv").as_str()).unwrap();
 
+        let dur_path = format!("{paramset_dir}/__WIP__durations.csv");
+        let mut dur_writer = csv::Writer::from_path(&dur_path).unwrap();
+        dur_writer
+            .write_record(["iteration", "time_human", "time_sec", "vtime"])
+            .unwrap();
+        dur_writer.flush().unwrap();
+
         for i in 0..paramset.num_iterations {
             let wip_queue_data_msgs_counts_path =
                 format!("{paramset_dir}/__WIP__iteration_{i}_data_msg_counts.csv");
 
-            run_iteration(
+            let start_time = SystemTime::now();
+            let vtime = run_iteration(
                 paramset.clone(),
                 i as u64,
                 &format!("{paramset_dir}/iteration_{i}_latency.csv"),
@@ -84,6 +92,15 @@ fn main() {
                 &format!("{paramset_dir}/iteration_{i}_ordering_coeff.csv"),
                 &format!("{paramset_dir}/iteration_{i}_topology.csv"),
             );
+            let duration = SystemTime::now().duration_since(start_time).unwrap();
+            dur_writer
+                .write_record([
+                    i.to_string(),
+                    format_duration(duration),
+                    duration.as_secs().to_string(),
+                    vtime.to_string(),
+                ])
+                .unwrap();
 
             let new_queue_data_msgs_counts_path =
                 wip_queue_data_msgs_counts_path.replace("__WIP__iteration_", "iteration_");
@@ -91,6 +108,11 @@ fn main() {
 
             tracing::info!("ParamSet:{}, Iteration:{} completed.", paramset.id, i);
         }
+        dur_writer.flush().unwrap();
+
+        let new_dur_path = dur_path.replace("__WIP__durations", "durations");
+        std::fs::rename(&dur_path, &new_dur_path)
+            .expect("Failed to rename: {dur_path} -> {new_dur_dir}: {e}");
 
         let new_paramset_dir = paramset_dir.replace("__WIP__paramset_", "paramset_");
         std::fs::rename(&paramset_dir, &new_paramset_dir)