X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/8d9632b768c69fa38bfc00cb58fcc9b7f3524755..7154ea8a74d7566156c7e65034fdbad45d230cf5:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index fc0843a..7af6b74 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,8 +41,16 @@ namespace {
     condition_t* proc_cond;
     unsigned proc_counter = 0;
 
-    statistics comps;
     statistics loads;
+    statistics comps;
+    statistics data_send_amount;
+    statistics data_recv_amount;
+    statistics data_send_count;
+    statistics data_recv_count;
+    statistics ctrl_send_amount;
+    statistics ctrl_recv_amount;
+    statistics ctrl_send_count;
+    statistics ctrl_recv_count;
 
 }
 
@@ -60,8 +68,16 @@ static int simulation_main(int argc, char* argv[])
         result = proc->run();
 
         proc_mutex->acquire();
-        comps.push(proc->get_comp());
         loads.push(proc->get_real_load());
+        comps.push(proc->get_comp_amount());
+        data_send_amount.push(proc->get_data_send_amount());
+        data_recv_amount.push(proc->get_data_recv_amount());
+        data_send_count.push(proc->get_data_send_count());
+        data_recv_count.push(proc->get_data_recv_count());
+        ctrl_send_amount.push(proc->get_ctrl_send_amount());
+        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());
 
         // Synchronization barrier...
         // The goal is to circumvent a limitation in SimGrid (at least
@@ -239,6 +255,14 @@ int main(int argc, char* argv[])
         XBT_INFO(",----[ Results ]");
         PR_STATS("Load", loads);
         PR_STATS("Computation", comps);
+        PR_STATS("Data send", data_send_amount);
+        PR_STATS("Data recv", data_recv_amount);
+        PR_STATS("Data send #", data_send_count);
+        PR_STATS("Data recv #", data_recv_count);
+        PR_STATS("Ctrl send", ctrl_send_amount);
+        PR_STATS("Ctrl recv", ctrl_recv_amount);
+        PR_STATS("Ctrl send #", ctrl_send_count);
+        PR_STATS("Ctrl recv #", ctrl_recv_count);
         XBT_INFO("| Total simulated time...................: %g",
                  simulated_time);
         XBT_INFO("| Total simulation time..................: %g",