Correct log messages.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index fe08b338b03120b39844a49e5f8ccaca0bfb6d52..e5ba3cd0fa596d3cefcd56d9f9ba2e2d40897c02 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -18,6 +18,18 @@ double process::total_load_init = 0.0;
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 

+namespace {
+
+    void sleep_until_date(double& date, double duration = 0.0)
+    {
+        double sleep_duration = date - MSG_get_clock();
+        if (sleep_duration > 0.0)
+            MSG_process_sleep(sleep_duration);
+        date = MSG_get_clock() + duration;
+    }
+
+}
+

 process::process(int argc, char* argv[])
 {
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
 process::process(int argc, char* argv[])
 {
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))


@@ -74,11 +86,8 @@ process::~process()
         XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g",
                  lb_iter, comp_iter, real_load, expected_load);
     } else {
         XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g",
                  lb_iter, comp_iter, real_load, expected_load);
     } else {

-        XBT_INFO("Final load after %d iterations: %g",
-                 lb_iter, real_load);
-        if (lb_iter != comp_iter)
-            XBT_WARN("lb_iter (%d) and comp_iter (%d) differ!",
-                     lb_iter, comp_iter);
+        XBT_INFO("Final load after %d:%d iterations: %g",
+                 lb_iter, comp_iter, real_load);

     }
     XBT_VERB("Total computation for this process: %g", comp);
 }
     }
     XBT_VERB("Total computation for this process: %g", comp);
 }


@@ -99,6 +108,7 @@ void process::load_balance_loop()
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
 
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
 

+    double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;

     while (still_running()) {
         ++lb_iter;
 
     while (still_running()) {
         ++lb_iter;
 


@@ -120,9 +130,8 @@ void process::load_balance_loop()
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
 
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
 

-        // block on receiving unless there is something to compute or
-        // to send
-        ctrl_receive(opt::min_lb_iter_duration);
+        sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
+        ctrl_receive(0.0);

 
         comm.ctrl_flush(false);
     }
 
         comm.ctrl_flush(false);
     }


@@ -145,13 +154,13 @@ void process::compute_loop()
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
 
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
 

-    double next_iter_after_date = 0.0;
+    double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;

     while (still_running()) {
         // receive
     while (still_running()) {
         // receive

-        double sleep_duration = real_load
-            ? std::max(MSG_get_clock() - next_iter_after_date, 0.0)
-            : opt::min_comp_iter_duration;
-        data_receive(sleep_duration);
+        if (real_load > 0.0)
+            data_receive(0.0);
+        else
+            data_receive(opt::min_comp_iter_duration);

 
         comm.data_flush(false);
 
 
         comm.data_flush(false);
 


@@ -172,7 +181,7 @@ void process::compute_loop()
         comp += flops;
         MSG_task_destroy(task);
 
         comp += flops;
         MSG_task_destroy(task);
 

-        next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
+        sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);

     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);