Add statistics about idle duration.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 6417250d128315df81fa935b377f40037ee0a1c1..45c58cede87dd13f559b1a144cfc42aefa154a70 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -61,6 +61,8 @@ namespace {
     statistics ctrl_recv_amount;
     statistics ctrl_send_count;
     statistics ctrl_recv_count;
     statistics ctrl_recv_amount;
     statistics ctrl_send_count;
     statistics ctrl_recv_count;

+    statistics idle_duration;
+    statistics convergence;

 
 }
 
 
 }
 


@@ -90,6 +92,10 @@ static int simulation_main(int argc, char* argv[])
         ctrl_recv_amount.push(proc->get_ctrl_recv_amount());
         ctrl_send_count.push(proc->get_ctrl_send_count());
         ctrl_recv_count.push(proc->get_ctrl_recv_count());
         ctrl_recv_amount.push(proc->get_ctrl_recv_amount());
         ctrl_send_count.push(proc->get_ctrl_send_count());
         ctrl_recv_count.push(proc->get_ctrl_recv_count());

+        idle_duration.push(proc->get_idle_duration());
+        double c = proc->get_convergence();
+        if (c != -1.0)
+            convergence.push(c);

 
         // Synchronization barrier...
         // The goal is to circumvent a limitation in SimGrid (at least
 
         // Synchronization barrier...
         // The goal is to circumvent a limitation in SimGrid (at least


@@ -174,6 +180,11 @@ static void install_signal_handler()
     }
 }
 
     }
 }
 

+#define PR_VALUE(descr, format, ...)                                    \
+    XBT_INFO("| %.*s: " format, DATA_DESCR_WIDTH,                       \
+             descr ".................................................", \
+             __VA_ARGS__)
+

 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
              descr " (total/avg./stddev).............................", \
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
              descr " (total/avg./stddev).............................", \


@@ -314,11 +325,13 @@ int main(int argc, char* argv[])
         elapsed_time.stop();
         if (!check_for_lost_load())
             exit_status |= EXIT_FAILURE_LOAD;
         elapsed_time.stop();
         if (!check_for_lost_load())
             exit_status |= EXIT_FAILURE_LOAD;

+

         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
         PR_STATS("Comp. iterations", comp_iterations);
         PR_STATS("X-Comp. iterations", all_comp_iterations);
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
         PR_STATS("Comp. iterations", comp_iterations);
         PR_STATS("X-Comp. iterations", all_comp_iterations);

+        PR_STATS("Idle duration", idle_duration);

         PR_STATS("Data send amount", data_send_amount);
         PR_STATS("Data recv amount", data_recv_amount);
         PR_STATS("Data send count", data_send_count);
         PR_STATS("Data send amount", data_send_amount);
         PR_STATS("Data recv amount", data_recv_amount);
         PR_STATS("Data send count", data_send_count);


@@ -327,16 +340,27 @@ int main(int argc, char* argv[])
         PR_STATS("Ctrl recv amount", ctrl_recv_amount);
         PR_STATS("Ctrl send count", ctrl_send_count);
         PR_STATS("Ctrl recv count", ctrl_recv_count);
         PR_STATS("Ctrl recv amount", ctrl_recv_amount);
         PR_STATS("Ctrl send count", ctrl_send_count);
         PR_STATS("Ctrl recv count", ctrl_recv_count);

-        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
-                 "Total simulated time..................................",
-                 simulated_time);
-        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
-                 "Total simulation time.................................",
-                 simulation_time.duration());
-        XBT_INFO("| %.*s: %g", DATA_DESCR_WIDTH,
-                 "Elapsed (wall clock) time.............................",
-                 elapsed_time.duration());
+        PR_VALUE("Total simulated time", "%g", simulated_time);
+        PR_VALUE("Total simulation time", "%g", simulation_time.duration());
+        PR_VALUE("Elapsed (wall clock) time", "%g", elapsed_time.duration());

         XBT_INFO("`----");
         XBT_INFO("`----");

+
+        double load_imbalance = 100.0 * loads.get_stddev() / loads.get_mean();
+        double transfer_amount =
+            data_send_amount.get_sum() / opt::comm_cost(loads.get_sum());
+
+        XBT_INFO(",----[ Useful metrics ]");
+        PR_VALUE("Final load imbalance", "%g %s", load_imbalance,
+                 "percent of the load average");
+        PR_VALUE("Data transfer amount", "%g %s", transfer_amount,
+                 "times the total amount of data");
+        PR_VALUE("Number of hosts that converged", "%u / %u",
+                 convergence.get_count(), loads.get_count());
+        PR_VALUE("Times of convergence (min/max/avg/dev)", "%g / %g / %g / %g",
+                 convergence.get_min(), convergence.get_max(),
+                 convergence.get_mean(), convergence.get_stddev());
+        XBT_INFO("`----");
+

     }
     if (exit_status)
         XBT_ERROR("Simulation failed (%#x).", exit_status);
     }
     if (exit_status)
         XBT_ERROR("Simulation failed (%#x).", exit_status);