]> AND Private Git Repository - loba.git/blobdiff - process.cpp
Logo AND Algorithmique Numérique Distribuée

Private GIT Repository
Update METRICS.
[loba.git] / process.cpp
index eeb5d8c0052ba166f56a20512053e6d4c62c88db..07372dc0515f763e8f16729d4437c6b94c55df5d 100644 (file)
@@ -1,6 +1,8 @@
 #include <algorithm>
-#include <tr1/functional>
+#include <cmath>
+#include <functional>
 #include <iterator>
+#include <numeric>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
@@ -20,7 +22,7 @@ double process::total_load_exit = 0.0;
 
 namespace {
 
-    void sleep_until_date(double& date, double duration = 0.0)
+    void sleep_until_date(double& date, double duration)
     {
         double sleep_duration = date - MSG_get_clock();
         if (sleep_duration > 0.0)
@@ -35,6 +37,13 @@ process::process(int argc, char* argv[])
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 
+    double iload = std::trunc(real_load);
+    if (opt::integer_transfer && real_load != iload) {
+        XBT_WARN("Initial load %g is not an integer.  Truncate it.",
+                 real_load);
+        real_load = iload;
+    }
+
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
@@ -45,22 +54,20 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
-    comp = 0.0;
-
     prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = real_load;
     total_load_running += real_load;
     total_load_init += real_load;
+    received_load = 0.0;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;
     finalizing = false;
 
-    comp_iter = lb_iter = 0;
+    all_comp_iter = 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::bind(&process::load_balance_loop, this));
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
@@ -71,7 +78,7 @@ process::process(int argc, char* argv[])
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),
-                       std::tr1::mem_fn(&neighbor::get_name));
+                       std::mem_fn(&neighbor::get_name));
         oss << neigh.back().get_name();
     }
     XBT_LOG(logp, "Got %s.", oss.str().c_str());
@@ -80,73 +87,91 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
-    delete compute_thread;
+    delete lb_thread;
     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 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_VERB("Total computation for this process: %g", comp);
+    xbt_assert(received_load == 0.0,
+               "received_load is %g, but should be 0.0 !", received_load);
+    if (opt::log_rate < 0)
+        return;
+    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);
 }
 
 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...");
-    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;
 }
 
 void process::load_balance_loop()
 {
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;
 
     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;
+        }
+
+        ctrl_receive(0.0);
+
+        mutex.acquire();
+        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::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:%u) current load: %g",
+                     lb_iter, comp_iter, all_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);
 
         // send
+        comm.ctrl_flush(false);
         std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::ctrl_send, this, _1));
+                      std::bind(&process::ctrl_send, this, _1));
+        prev_load_broadcast = expected_load;
+        mutex.release();
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
-        ctrl_receive(0.0);
-
-        comm.ctrl_flush(false);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     XBT_DEBUG("send CTRL_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
-                  bind(&process::ctrl_close, this, _1));
+                  std::bind(&process::ctrl_close, this, _1));
     while (ctrl_close_pending) {
         comm.ctrl_flush(false);
-        XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
+        XBT_DEBUG("waiting for %d CTRL_CLOSE", ctrl_close_pending);
         ctrl_receive(-1.0);
     }
     comm.ctrl_flush(true);
@@ -154,26 +179,26 @@ void process::load_balance_loop()
 
 void process::compute_loop()
 {
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;
 
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {
-        // receive
-        if (real_load > 0.0)
-            data_receive(0.0);
-        else
-            data_receive(opt::min_comp_iter_duration);
+        // receive (do not block if there is something to compute)
+        data_receive(real_load > 0.0 ? 0.0 : opt::min_comp_iter_duration);
 
+        // send
         comm.data_flush(false);
+        mutex.acquire();
+        real_load += received_load;
+        received_load = 0.0;
+        std::for_each(neigh.begin(), neigh.end(),
+                      std::bind(&process::data_send, this, _1));
+        mutex.release();
 
+        ++all_comp_iter;
         if (real_load == 0.0)
             continue;
 
-        // send
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::data_send, this, _1));
-
         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
@@ -181,22 +206,26 @@ void process::compute_loop()
         TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
-        comp += flops;
+        add_comp_amount(flops);
         MSG_task_destroy(task);
 
         sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
+    finalizing = true;
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
-                  bind(&process::data_close, this, _1));
+                  std::bind(&process::data_close, this, _1));
     while (data_close_pending) {
         comm.data_flush(false);
-        XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);
+        XBT_DEBUG("waiting for %d DATA_CLOSE", data_close_pending);
         data_receive(-1.0);
     }
+    real_load += received_load;
+    received_load = 0.0;
+    total_load_running -= real_load;
     comm.data_flush(true);
 }
 
@@ -207,6 +236,10 @@ bool process::still_running()
     if (!last_status) {
         /* nop */
 
+    } else if (opt::exit_request) {
+        XBT_VERB("Global exit requested");
+        last_status = false;
+
     } else if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
         XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
         last_status = false;
@@ -231,7 +264,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!
-        // fixme: should this chunk be moved before call to receive() ?
         XBT_VERB("No more load to balance in system.");
         last_status = false;
     }
@@ -239,6 +271,16 @@ bool process::still_running()
     return last_status;
 }
 
+double process::get_sum_of_to_send() const
+{
+    using std::placeholders::_1;
+    using std::placeholders::_2;
+
+    return std::accumulate(neigh.begin(), neigh.end(), 0.0,
+                           std::bind(std::plus<double>(), _1,
+                                     std::bind(&neighbor::get_to_send, _2)));
+}
+
 void process::load_balance()
 {
     if (lb_iter == 1)           // warn only once
@@ -247,73 +289,73 @@ void process::load_balance()
 
 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);
 }
 
-#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)
 {
-    double info_to_send = get_load();
-    if (info_to_send != prev_load_broadcast)
-        comm.ctrl_send(nb.get_ctrl_mbox(),
-                       new message(message::INFO, info_to_send));
-    if (opt::bookkeeping) {
-        double debt_to_send = nb.get_to_send();
+    double info_to_send = expected_load;
+    double debt_to_send;
+    if (opt::bookkeeping) {     // bookkeeping
+        debt_to_send = nb.get_to_send();
         if (debt_to_send > 0.0) {
             nb.set_to_send(0.0);
             nb.set_debt(nb.get_debt() + debt_to_send);
-            comm.ctrl_send(nb.get_ctrl_mbox(),
-                           new message(message::CREDIT, debt_to_send));
         }
+    } else {                    // !bookkeeping
+        debt_to_send = 0.0;
+    }
+    if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {
+        message* msg = new message(message::CTRL, info_to_send, debt_to_send);
+        add_ctrl_send_mesg(msg->get_size());
+        comm.ctrl_send(nb.get_ctrl_mbox(), msg);
     }
 }
 
+double process::compute_load_to_send(double desired)
+{
+    if (opt::integer_transfer)
+        desired = std::floor(desired);
+    return desired >= opt::min_transfer_amount ? desired : 0.0;
+}
+
 void process::data_send(neighbor& nb)
 {
     double load_to_send;
-    if (opt::bookkeeping) {
-        if (real_load <= nb.get_debt()) {
-            load_to_send = real_load;
+    if (opt::bookkeeping) {     // bookkeeping
+        double excess_load;     // load amount we are able to send
+        if (opt::egocentric)
+            excess_load = std::max(0.0, real_load - expected_load);
+        else
+            excess_load = real_load;
+
+        double balance = nb.get_debt() - nb.get_credit();
+        load_to_send = std::min(excess_load,
+                                std::max(0.0, balance));
+
+        // adjust load to send (rounding, truncation, etc.)
+        load_to_send = compute_load_to_send(load_to_send);
+        if (load_to_send > 0.0)
             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;
-        }
-    } else {
-        load_to_send = nb.get_to_send();
-        nb.set_to_send(0.0);
+    } else {                    // !bookkeeping
+        load_to_send = compute_load_to_send(nb.get_to_send());
+        if (load_to_send > 0.0)
+            nb.set_to_send(nb.get_to_send() - load_to_send);
+    }
+    real_load -= load_to_send;
+    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;
+        message* msg = new message(message::DATA, amount);
+        add_data_send_mesg(msg->get_size());
+        comm.data_send(nb.get_data_mbox(), msg);
+        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)
@@ -333,6 +375,8 @@ void process::ctrl_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
     while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::CTRL_CLOSE)
+            add_ctrl_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
     }
@@ -345,6 +389,8 @@ void process::data_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
     while (data_close_pending && comm.data_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::DATA_CLOSE)
+            add_data_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
     }
@@ -353,19 +399,21 @@ void process::data_receive(double timeout)
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {
-    case message::INFO: {
+    case message::CTRL: {
         neighbor* n = rev_neigh[from];
-        n->set_load(msg->get_amount());
+        n->set_load(msg->get_amount() + n->get_to_send());
+        if (opt::bookkeeping) {
+            double credit = msg->get_credit();
+            expected_load += credit;
+            n->set_credit(n->get_credit() + credit);
+        }
         break;
     }
-    case message::CREDIT:
-        expected_load += msg->get_amount();
-        break;
-    case message::LOAD: {
+    case message::DATA: {
+        neighbor* n = rev_neigh[from];
         double ld = msg->get_amount();
-        real_load += ld;
-        if (finalizing)
-            total_load_running -= ld;
+        received_load += ld;
+        n->set_credit(n->get_credit() - ld);
         break;
     }
     case message::CTRL_CLOSE:
@@ -380,6 +428,31 @@ void process::handle_message(message* msg, m_host_t from)
     delete msg;
 }
 
+#define print_loads_generic(vec, verbose, logp, cat)                    \
+    if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
+        using std::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(),                           \
+                      std::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: