Add debug messages.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index e5ba3cd0fa596d3cefcd56d9f9ba2e2d40897c02..33a993ef5eb8e96041302b563acef1fafeb557b7 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>

+#include <numeric>

 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>


@@ -58,9 +59,9 @@ process::process(int argc, char* argv[])
 
     comp_iter = lb_iter = 0;
 
 
     comp_iter = lb_iter = 0;
 

-    compute_thread = new_msg_thread("compute",
-                                    std::tr1::bind(&process::compute_loop,
-                                                   this));
+    lb_thread = new_msg_thread("loba",
+                               std::tr1::bind(&process::load_balance_loop,
+                                              this));

 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -80,25 +81,33 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
 
 process::~process()
 {

-    delete compute_thread;
+    delete lb_thread;

     total_load_exit += real_load;
     total_load_exit += real_load;

-    if (opt::bookkeeping) {
-        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",
-                 lb_iter, comp_iter, real_load);
-    }
+    if (opt::log_rate < 0)
+        return;
+    XBT_INFO("Final load after %d:%d iterations: %g",
+             lb_iter, comp_iter, real_load);
+    XBT_VERB("Expected load was: %g", expected_load);

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

-    XBT_INFO("Initial load: %g", real_load);
+    if (opt::log_rate >= 0) {
+        XBT_INFO("Initial load: %g", real_load);
+        XBT_VERB("Initial expected load: %g", expected_load);
+    }

     XBT_VERB("Starting...");
     XBT_VERB("Starting...");

-    compute_thread->start();
-    load_balance_loop();
-    compute_thread->wait();
+    mutex.acquire();
+    lb_thread->start();
+    while (lb_iter <= opt::comp_iter_delay)
+        cond.wait(mutex);
+    mutex.release();
+    double sleep_duration = opt::comp_time_delay - MSG_get_clock();
+    if (sleep_duration > 0.0)
+        MSG_process_sleep(sleep_duration);
+    compute_loop();
+    lb_thread->wait();

     XBT_VERB("Done.");
     return 0;
 }
     XBT_VERB("Done.");
     return 0;
 }


@@ -110,18 +119,25 @@ void process::load_balance_loop()
 
     double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
     while (still_running()) {
 
     double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
     while (still_running()) {

-        ++lb_iter;
+        if (lb_iter == opt::comp_iter_delay) {
+            mutex.acquire();
+            ++lb_iter;
+            cond.signal();
+            mutex.release();
+        } else {
+            ++lb_iter;
+        }
+
+        if (!opt::bookkeeping)
+            expected_load = real_load - get_sum_of_to_send();
+        // nothing to do with opt::bookkeeping

 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {

-            if (opt::bookkeeping)
-                XBT_INFO("(%u:%u) current load: %g ; expected: %g",
-                         lb_iter, comp_iter, real_load, expected_load);
-            else
-                XBT_INFO("(%u:%u) current load: %g",
-                         lb_iter, comp_iter, real_load);
+            XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
+            XBT_VERB("... expected load: %g", expected_load);

         }
 
         }
 

-        if (get_load() > 0.0)
+        if (expected_load > 0.0)

             load_balance();
 
         print_loads(true, xbt_log_priority_debug);
             load_balance();
 
         print_loads(true, xbt_log_priority_debug);


@@ -129,6 +145,7 @@ void process::load_balance_loop()
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));

+        prev_load_broadcast = expected_load;

 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);


@@ -185,6 +202,11 @@ void process::compute_loop()
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);

+    // last send, for not losing load scheduled to be sent
+    std::for_each(neigh.begin(), neigh.end(),
+                  bind(&process::data_send, this, _1));
+    finalizing = true;
+    total_load_running -= real_load;

     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),


@@ -228,7 +250,6 @@ bool process::still_running()
                opt::load_ratio_threshold) {
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
                opt::load_ratio_threshold) {
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!

-        // fixme: should this chunk be moved before call to receive() ?

         XBT_VERB("No more load to balance in system.");
         last_status = false;
     }
         XBT_VERB("No more load to balance in system.");
         last_status = false;
     }


@@ -236,6 +257,17 @@ bool process::still_running()
     return last_status;
 }
 
     return last_status;
 }
 

+double process::get_sum_of_to_send() const
+{
+    using std::tr1::bind;
+    using std::tr1::placeholders::_1;
+    using std::tr1::placeholders::_2;
+
+    return std::accumulate(neigh.begin(), neigh.end(), 0.0,
+                           bind(std::plus<double>(),
+                                _1, bind(&neighbor::get_to_send, _2)));
+}
+

 void process::load_balance()
 {
     if (lb_iter == 1)           // warn only once
 void process::load_balance()
 {
     if (lb_iter == 1)           // warn only once


@@ -244,39 +276,14 @@ void process::load_balance()
 
 void process::send(neighbor& nb, double amount)
 {
 
 void process::send(neighbor& nb, double amount)
 {

-    set_load(get_load() - amount);
+    expected_load -= amount;

     nb.set_to_send(nb.get_to_send() + amount);
     nb.set_load(nb.get_load() + amount);
 }
 
     nb.set_to_send(nb.get_to_send() + amount);
     nb.set_load(nb.get_load() + amount);
 }
 

-#define print_loads_generic(vec, verbose, logp, cat)                    \
-    if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
-        using std::tr1::bind;                                           \
-        using std::tr1::placeholders::_1;                               \
-        XBT_XCLOG(cat, logp, "Neighbor loads:");                        \
-        std::for_each(vec.begin(), vec.end(),                           \
-                      bind(&neighbor::print, _1, verbose, logp, cat));  \
-    } else ((void)0)
-
-void process::print_loads(bool verbose,
-                          e_xbt_log_priority_t logp,
-                          xbt_log_category_t cat) const
-{
-    print_loads_generic(neigh, verbose, logp, cat);
-}
-
-void process::print_loads_p(bool verbose,
-                            e_xbt_log_priority_t logp,
-                            xbt_log_category_t cat) const
-{
-    print_loads_generic(pneigh, verbose, logp, cat);
-}
-
-#undef print_loads_generic
-

 void process::ctrl_send(neighbor& nb)
 {
 void process::ctrl_send(neighbor& nb)
 {

-    double info_to_send = get_load();
+    double info_to_send = expected_load;

     if (info_to_send != prev_load_broadcast)
         comm.ctrl_send(nb.get_ctrl_mbox(),
                        new message(message::INFO, info_to_send));
     if (info_to_send != prev_load_broadcast)
         comm.ctrl_send(nb.get_ctrl_mbox(),
                        new message(message::INFO, info_to_send));


@@ -295,22 +302,31 @@ void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {
 {
     double load_to_send;
     if (opt::bookkeeping) {

-        if (real_load <= nb.get_debt()) {
-            load_to_send = real_load;
+        load_to_send = std::min(real_load, nb.get_debt());
+        if (load_to_send >= opt::min_transfer_amount) {

             nb.set_debt(nb.get_debt() - load_to_send);
             nb.set_debt(nb.get_debt() - load_to_send);

-            real_load = 0.0;
-        } else {
-            load_to_send = nb.get_debt();
-            nb.set_debt(0.0);

             real_load -= load_to_send;
             real_load -= load_to_send;

+        } else {
+            load_to_send = 0.0;

         }
     } else {
         load_to_send = nb.get_to_send();
         }
     } else {
         load_to_send = nb.get_to_send();

-        nb.set_to_send(0.0);
+        if (load_to_send >= opt::min_transfer_amount) {
+            nb.set_to_send(0.0);
+            real_load -= load_to_send;
+        } else {
+            load_to_send = 0.0;
+        }
+    }
+    while (load_to_send > 0.0) {
+        double amount;
+        if (opt::max_transfer_amount)
+            amount = std::min(load_to_send, opt::max_transfer_amount);
+        else
+            amount = load_to_send;
+        comm.data_send(nb.get_data_mbox(), new message(message::LOAD, amount));
+        load_to_send -= amount;

     }
     }

-    if (load_to_send > 0.0)
-        comm.data_send(nb.get_data_mbox(),
-                       new message(message::LOAD, load_to_send));

 }
 
 void process::ctrl_close(neighbor& nb)
 }
 
 void process::ctrl_close(neighbor& nb)


@@ -352,7 +368,7 @@ void process::handle_message(message* msg, m_host_t from)
     switch (msg->get_type()) {
     case message::INFO: {
         neighbor* n = rev_neigh[from];
     switch (msg->get_type()) {
     case message::INFO: {
         neighbor* n = rev_neigh[from];

-        n->set_load(msg->get_amount());
+        n->set_load(msg->get_amount() + n->get_to_send());

         break;
     }
     case message::CREDIT:
         break;
     }
     case message::CREDIT:


@@ -377,6 +393,32 @@ void process::handle_message(message* msg, m_host_t from)
     delete msg;
 }
 
     delete msg;
 }
 

+#define print_loads_generic(vec, verbose, logp, cat)                    \
+    if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
+        using std::tr1::bind;                                           \
+        using std::tr1::placeholders::_1;                               \
+        XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  "     \
+                  "Neighbor loads:", real_load, expected_load);         \
+        std::for_each(vec.begin(), vec.end(),                           \
+                      bind(&neighbor::print, _1, verbose, logp, cat));  \
+    } else ((void)0)
+
+void process::print_loads(bool verbose,
+                          e_xbt_log_priority_t logp,
+                          xbt_log_category_t cat) const
+{
+    print_loads_generic(neigh, verbose, logp, cat);
+}
+
+void process::print_loads_p(bool verbose,
+                            e_xbt_log_priority_t logp,
+                            xbt_log_category_t cat) const
+{
+    print_loads_generic(pneigh, verbose, logp, cat);
+}
+
+#undef print_loads_generic
+

 // Local variables:
 // mode: c++
 // End:
 // Local variables:
 // mode: c++
 // End: