Update METRICS.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 5d0f98bc5da9fa2532cec0cc0533414a325a146d..07372dc0515f763e8f16729d4437c6b94c55df5d 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -64,7 +64,7 @@ process::process(int argc, char* argv[])
     close_received = false;
     finalizing = false;
 
     close_received = false;
     finalizing = false;
 

-    comp_iter = lb_iter = 0;
+    all_comp_iter = comp_iter = lb_iter = 0;

 
     lb_thread = new_msg_thread("loba",
                                std::bind(&process::load_balance_loop, this));
 
     lb_thread = new_msg_thread("loba",
                                std::bind(&process::load_balance_loop, this));


@@ -93,8 +93,8 @@ process::~process()
                "received_load is %g, but should be 0.0 !", received_load);
     if (opt::log_rate < 0)
         return;
                "received_load is %g, but should be 0.0 !", received_load);
     if (opt::log_rate < 0)
         return;

-    XBT_INFO("Final load after %d:%d iterations: %g",
-             lb_iter, comp_iter, real_load);
+    XBT_INFO("Final load after %d:%d:%d iterations: %g",
+             lb_iter, comp_iter, all_comp_iter, real_load);

     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
     print_loads(true, xbt_log_priority_debug);
     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
     print_loads(true, xbt_log_priority_debug);


@@ -144,7 +144,8 @@ void process::load_balance_loop()
         // nothing to do with opt::bookkeeping
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
         // nothing to do with opt::bookkeeping
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {

-            XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
+            XBT_INFO("(%u:%u:%u) current load: %g",
+                     lb_iter, comp_iter, all_comp_iter, real_load);

             XBT_VERB("... expected load: %g", expected_load);
         }
 
             XBT_VERB("... expected load: %g", expected_load);
         }
 


@@ -194,6 +195,7 @@ void process::compute_loop()
                       std::bind(&process::data_send, this, _1));
         mutex.release();
 
                       std::bind(&process::data_send, this, _1));
         mutex.release();
 

+        ++all_comp_iter;

         if (real_load == 0.0)
             continue;
 
         if (real_load == 0.0)
             continue;