Add some notes in TESTS.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 12f1ae245140db23fa59c415f148edd5e34c7893..45c58cede87dd13f559b1a144cfc42aefa154a70 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -61,6 +61,7 @@ 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;
 
 }
     statistics convergence;
 
 }


@@ -91,8 +92,9 @@ 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();
         double c = proc->get_convergence();

-        if (c != -1)
+        if (c != -1.0)

             convergence.push(c);
 
         // Synchronization barrier...
             convergence.push(c);
 
         // Synchronization barrier...


@@ -329,6 +331,7 @@ int main(int argc, char* argv[])
         PR_STATS("Computation", comps);
         PR_STATS("Comp. iterations", comp_iterations);
         PR_STATS("X-Comp. iterations", all_comp_iterations);
         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);


@@ -353,8 +356,9 @@ int main(int argc, char* argv[])
                  "times the total amount of data");
         PR_VALUE("Number of hosts that converged", "%u / %u",
                  convergence.get_count(), loads.get_count());
                  "times the total amount of data");
         PR_VALUE("Number of hosts that converged", "%u / %u",
                  convergence.get_count(), loads.get_count());

-        PR_VALUE("Date of first host convergence", "%g", convergence.get_min());
-        PR_VALUE("Date of last host convergence", "%g", convergence.get_max());
+        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("`----");
 
     }
         XBT_INFO("`----");
 
     }