X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/97a4b4dbf628a627e3c2d5689be89265f56074df..62556b444506565f9a55889f482d8758ca50c3a6:/process.cpp?ds=inline

diff --git a/process.cpp b/process.cpp
index 214b9d0..f997d99 100644
--- a/process.cpp
+++ b/process.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
-#include <numeric>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
@@ -11,15 +10,29 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 #include "misc.h"
 #include "options.h"
+#include "tracing.h"
 
 #include "process.h"
 
 double process::total_load_init = 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]) >> load))
+    if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 
     neigh.assign(argv + 2, argv + argc);
@@ -32,16 +45,22 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
-    expected_load = load;
-    total_load_init += load;
+    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;
 
     ctrl_close_pending = data_close_pending = neigh.size();
-    if (neigh.size() == 1) {
-        comm.next_close_on_ctrl_is_last();
-        comm.next_close_on_data_is_last();
-    }
-    if (neigh.size() > 0)
-        comm.listen();
+    close_received = false;
+    finalizing = false;
+
+    comp_iter = lb_iter = 0;
+
+    compute_thread = new_msg_thread("compute",
+                                    std::tr1::bind(&process::compute_loop,
+                                                   this));
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
@@ -55,238 +74,194 @@ process::process(int argc, char* argv[])
                        std::tr1::mem_fn(&neighbor::get_name));
         oss << neigh.back().get_name();
     }
-    LOG1(logp, "Got %s.", oss.str().c_str());
-    print_loads(true, logp);
+    XBT_LOG(logp, "Got %s.", oss.str().c_str());
+    print_loads(false, logp);
 }
 
 process::~process()
 {
-    total_load_exit += load;
+    delete compute_thread;
+    total_load_exit += real_load;
+    if (opt::log_rate < 0)
+        return;
+    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);
+    }
+    XBT_VERB("Total computation for this process: %g", comp);
 }
 
 int process::run()
 {
-    INFO1("Initial load: %g", load);
-    VERB0("Starting...");
-    // first send() to inform neighbors about our load (force it)
-    prev_load_broadcast = -1;
-    iter = 0;
-    bool one_more = true;
-    do {
-        ++iter;
-
-        if (opt::log_rate && iter % opt::log_rate == 0) {
+    if (opt::log_rate >= 0)
+        XBT_INFO("Initial load: %g", real_load);
+    XBT_VERB("Starting...");
+    compute_thread->start();
+    load_balance_loop();
+    compute_thread->wait();
+    XBT_VERB("Done.");
+    return 0;
+}
+
+void process::load_balance_loop()
+{
+    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;
+
+        if (opt::log_rate && lb_iter % opt::log_rate == 0) {
             if (opt::bookkeeping)
-                INFO3("(%u) current load: %g ; expected: %g",
-                      iter, load, expected_load);
+                XBT_INFO("(%u:%u) current load: %g ; expected: %g",
+                         lb_iter, comp_iter, real_load, expected_load);
             else
-                INFO2("(%u) current load: %g",
-                      iter, load);
+                XBT_INFO("(%u:%u) current load: %g",
+                         lb_iter, comp_iter, real_load);
         }
+
+        if (get_load() > 0.0)
+            load_balance();
+
         print_loads(true, xbt_log_priority_debug);
 
-        if (opt::bookkeeping)
-            expected_load -= load_balance(expected_load);
-        else
-            load -= load_balance(load);
-
-        send();
-        compute();
-
-// NDS for Need To Send
-#define NDS ((opt::bookkeeping ? expected_load : load) != prev_load_broadcast)
-        bool can_recv;
-        do {
-            // General idea: do not iterate if there is nothing to
-            // compute, nor to send.
-
-            // fixme: review this chunk, and remove this NDS macro!
-
-            bool recv_wait = (load == 0 && !NDS);
-            bool close_received = !receive(recv_wait? WAIT: NO_WAIT);
-
-            if (opt::exit_on_close && close_received)
-                one_more = false;
-            else if (opt::maxiter && iter >= opt::maxiter)
-                one_more = false;
-            
-            can_recv = (ctrl_close_pending || data_close_pending);
-
-        } while (one_more && can_recv && load == 0 && !NDS);
-#undef NDS
-
-    } while (one_more);
-    VERB0("Going to finalize...");
-    finalize();
-
-    /* Open Questions :
-     * - definition of load on heterogeneous hosts ?
-     * - how to detect convergence ?
-     * - how to manage link failures ?
-     */
-
-    VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
-    if (opt::bookkeeping)
-        INFO1("Expected load: %g", expected_load);
-    return 0;
-}
+        // send
+        std::for_each(neigh.begin(), neigh.end(),
+                      bind(&process::ctrl_send, this, _1));
+        prev_load_broadcast = get_load();
 
-double process::sum_of_to_send() const
-{
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+        sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
+        ctrl_receive(0.0);
 
-    return std::accumulate(neigh.begin(), neigh.end(), 0.0,
-                           bind(std::plus<double>(),
-                                _1, bind(&neighbor::get_to_send, _2)));
-}
+        comm.ctrl_flush(false);
+    }
 
-double process::load_balance(double /*my_load*/)
-{
-    if (iter == 1)
-        WARN0("process::load_balance is a no-op!");
-    return 0.0;
+    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));
+    while (ctrl_close_pending) {
+        comm.ctrl_flush(false);
+        XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
+        ctrl_receive(-1.0);
+    }
+    comm.ctrl_flush(true);
 }
 
-void process::compute()
+void process::compute_loop()
 {
-    if (load > 0.0) {
-        double duration = opt::comp_cost(load);
-        m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
-        DEBUG2("compute %g flop%s.", duration, ESSE(duration));
+    using std::tr1::bind;
+    using std::tr1::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);
+
+        comm.data_flush(false);
+
+        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);
+        m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
+        XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
+        comp += flops;
         MSG_task_destroy(task);
-    } else {
-        DEBUG0("nothing to compute !");
-    }
-}
 
-void process::send1_no_bookkeeping(neighbor& nb)
-{
-    if (load != prev_load_broadcast)
-        comm.send(nb.get_ctrl_mbox(), new message(message::INFO, load));
-    double load_to_send = nb.get_to_send();
-    if (load_to_send > 0.0) {
-        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
-        nb.set_to_send(0.0);
+        sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);
     }
-}
 
-void process::send1_bookkeeping(neighbor& nb)
-{
-    if (expected_load != prev_load_broadcast)
-        comm.send(nb.get_ctrl_mbox(),
-                  new message(message::INFO, expected_load));
-    double load_to_send;
-    double new_debt;
-    double debt_to_send = nb.get_to_send();
-    if (debt_to_send > 0.0) {
-        comm.send(nb.get_ctrl_mbox(),
-                  new message(message::CREDIT, debt_to_send));
-        nb.set_to_send(0.0);
-        new_debt = nb.get_debt() + debt_to_send;
-    } else {
-        new_debt = nb.get_debt();
-    }
-    if (load <= new_debt) {
-        load_to_send = load;
-        nb.set_debt(new_debt - load_to_send);
-        load = 0.0;
-    } else {
-        load_to_send = new_debt;
-        nb.set_debt(0.0);
-        load -= load_to_send;
+    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(),
+                  bind(&process::data_close, this, _1));
+    while (data_close_pending) {
+        comm.data_flush(false);
+        XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);
+        data_receive(-1.0);
     }
-    if (load_to_send > 0.0)
-        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
+    comm.data_flush(true);
 }
 
-void process::send()
+bool process::still_running()
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    static bool last_status = true;
 
-    if (opt::bookkeeping) {
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::send1_bookkeeping, this, _1));
-        prev_load_broadcast = expected_load;
-    } else {
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::send1_no_bookkeeping, this, _1));
-        prev_load_broadcast = load;
-    }
-}
+    if (!last_status) {
+        /* nop */
 
-bool process::receive(recv_wait_mode wait)
-{
-    // DEBUG1("go for receive(%s)",
-    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
-    bool result = true;
-    message* msg;
-    m_host_t from;
-    bool do_recv = ctrl_close_pending || data_close_pending;
-    while (do_recv && comm.recv(msg, from, wait)) {
-        switch (msg->get_type()) {
-        case message::INFO: {
-            neighbor* n = rev_neigh[from];
-            n->set_load(msg->get_amount());
-            break;
-        }
-        case message::CREDIT:
-            expected_load += msg->get_amount();
-            break;
-        case message::LOAD:
-            load += msg->get_amount();
-            break;
-        case message::CTRL_CLOSE:
-            if (--ctrl_close_pending == 1)
-                comm.next_close_on_ctrl_is_last();
-            DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);
-            result = false;
-            break;
-        case message::DATA_CLOSE:
-            if (--data_close_pending == 1)
-                comm.next_close_on_data_is_last();
-            DEBUG1("data_close_pending = %d", data_close_pending);
-            result = false;
-            break;
-        }
-        delete msg;
-        do_recv = (wait == WAIT_FOR_CLOSE) &&
-            (ctrl_close_pending || data_close_pending);
+    } 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;
+
+    } else if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) {
+        XBT_VERB("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter);
+        last_status = false;
+
+    } else if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) {
+        XBT_VERB("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter);
+        last_status = false;
+
+    } else if (opt::exit_on_close && close_received) {
+        XBT_VERB("Close received");
+        last_status = false;
+
+    } else if (real_load == 0.0 && !data_close_pending) {
+        XBT_VERB("I'm a poor lonesome process, and I have no load...");
+        last_status = false;
+
+    } else if (100.0 * total_load_running / total_load_init <=
+               opt::load_ratio_threshold) {
+        // fixme: this check should be implemented with a distributed
+        // algorithm, and not a shared global variable!
+        XBT_VERB("No more load to balance in system.");
+        last_status = false;
     }
-    return result;
+
+    return last_status;
 }
 
-void process::finalize1(neighbor& nb)
+void process::load_balance()
 {
-    comm.send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
-    comm.send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));    
+    if (lb_iter == 1)           // warn only once
+        XBT_WARN("process::load_balance() is a no-op!");
 }
 
-void process::finalize()
+void process::send(neighbor& nb, double amount)
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
-
-    DEBUG2("send CLOSE to %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    std::for_each(neigh.begin(), neigh.end(),
-                  bind(&process::finalize1, this, _1));
-
-    DEBUG2("wait for CLOSE from %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    receive(WAIT_FOR_CLOSE);
-
-    comm.flush(true);
+    set_load(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 namespace std::tr1;                                       \
-        using namespace std::tr1::placeholders;                         \
-        XCLOG0(cat, logp, "Neighbor loads:");                           \
+        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)
@@ -307,6 +282,110 @@ void process::print_loads_p(bool verbose,
 
 #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();
+        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));
+        }
+    }
+}
+
+void process::data_send(neighbor& nb)
+{
+    double load_to_send;
+    if (opt::bookkeeping) {
+        if (real_load <= nb.get_debt()) {
+            load_to_send = real_load;
+            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);
+        // do not update real_load here
+    }
+    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)
+{
+    comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
+}
+
+void process::data_close(neighbor& nb)
+{
+    comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
+}
+
+void process::ctrl_receive(double timeout)
+{
+    message* msg;
+    m_host_t from;
+
+    XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
+    while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
+        handle_message(msg, from);
+        timeout = 0.0;
+    }
+}
+
+void process::data_receive(double timeout)
+{
+    message* msg;
+    m_host_t from;
+
+    XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
+    while (data_close_pending && comm.data_recv(msg, from, timeout)) {
+        handle_message(msg, from);
+        timeout = 0.0;
+    }
+}
+
+void process::handle_message(message* msg, m_host_t from)
+{
+    switch (msg->get_type()) {
+    case message::INFO: {
+        neighbor* n = rev_neigh[from];
+        n->set_load(msg->get_amount());
+        break;
+    }
+    case message::CREDIT:
+        expected_load += msg->get_amount();
+        break;
+    case message::LOAD: {
+        double ld = msg->get_amount();
+        real_load += ld;
+        if (finalizing)
+            total_load_running -= ld;
+        break;
+    }
+    case message::CTRL_CLOSE:
+        ctrl_close_pending--;
+        close_received = true;
+        break;
+    case message::DATA_CLOSE:
+        data_close_pending--;
+        close_received = true;
+        break;
+    }
+    delete msg;
+}
+
 // Local variables:
 // mode: c++
 // End: