Update prev_load_broadcast.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 1a9066d66d013ba234f097fcffa5661cbba2a476..26e11370216a4de9b928035d467dadae39f7a041 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,5 +1,3 @@
-#include "process.h"
-

 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>


@@ -7,31 +5,62 @@
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>

+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
+

 #include "misc.h"
 #include "options.h"
 #include "misc.h"
 #include "options.h"

+#include "tracing.h"
+
+#include "process.h"

 
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+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[])
 {
 
 process::process(int argc, char* argv[])
 {

-    if (argc < 2 || !(std::istringstream(argv[1]) >> load))
-        throw std::invalid_argument("bad or missing initial 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);
 
 
     neigh.assign(argv + 2, argv + argc);
 

-    std::for_each(neigh.begin(), neigh.end(),
-                  std::tr1::bind(&process::insert_neighbor_in_map,
-                                 this, std::tr1::placeholders::_1));
+    pneigh.reserve(neigh.size());
+    for (unsigned i = 0 ; i < neigh.size() ; i++) {
+        neighbor* ptr = &neigh[i];
+        m_host_t host = MSG_get_host_by_name(ptr->get_name());
+        pneigh.push_back(ptr);
+        rev_neigh.insert(std::make_pair(host, ptr));
+    }
+
+    comp = 0.0;

 
 

-    expected_load = load;
+    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();
 
     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))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -45,213 +74,310 @@ process::process(int argc, char* argv[])
                        std::tr1::mem_fn(&neighbor::get_name));
         oss << neigh.back().get_name();
     }
                        std::tr1::mem_fn(&neighbor::get_name));
         oss << neigh.back().get_name();
     }

-    LOG1(logp, "Got %s.", oss.str().c_str());
-    print_loads(logp);
+    XBT_LOG(logp, "Got %s.", oss.str().c_str());
+    print_loads(false, logp);
+}
+
+process::~process()
+{
+    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()
 {
 }
 
 int process::run()
 {

-    bool one_more = true;
+    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;

 
 

-    INFO1("Initial load: %g", load);
-    VERB0("Starting...");
-    iter = 0;
-    while (one_more) {
-        ++iter;
+    double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
+    while (still_running()) {
+        ++lb_iter;

 
 

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

             if (opt::bookkeeping)
             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
             else

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

         }
 
         }
 

-        compute();
+        if (get_load() > 0.0)
+            load_balance();
+
+        print_loads(true, xbt_log_priority_debug);
+
+        // send
+        std::for_each(neigh.begin(), neigh.end(),
+                      bind(&process::ctrl_send, this, _1));
+        prev_load_broadcast = get_load();
+
+        sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
+        ctrl_receive(0.0);

 
 

-        bool close_received = !receive(false);
+        comm.ctrl_flush(false);
+    }

 
 

-        if (opt::bookkeeping)
-            expected_load -= load_balance(expected_load);
+    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_loop()
+{
+    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
         else

-            load -= load_balance(load);
+            data_receive(opt::min_comp_iter_duration);
+
+        comm.data_flush(false);

 
 

-        send();
-        comm.flush(false);
+        if (real_load == 0.0)
+            continue;

 
 

-        if (opt::exit_on_close && close_received)
-            one_more = false;
-        if (opt::maxiter && iter >= opt::maxiter)
-            one_more = false;
+        // 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);
+
+        sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);

     }
     }

-    VERB0("Going to finalize...");
-    finalize();
-
-    /* Open Questions :
-     * - definition of load on heterogeneous hosts ?
-     * - how to detect convergence ?
-     * - how to manage link failures ?
-     */
-
-    VERB0("Done.");
-    if (opt::bookkeeping)
-        INFO4("Final load after %d iteration%s: %g ; expected: %g",
-              iter, ESSE(iter), load, expected_load);
-    else
-        INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
-    return 0;
+
+    XBT_VERB("Going to finalize for %s...", __func__);
+    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);
+    }
+    comm.data_flush(true);
+}
+
+bool process::still_running()
+{
+    static bool last_status = true;
+
+    if (!last_status) {
+        /* nop */
+
+    } 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 last_status;

 }
 
 }
 

-void process::compute()
+void process::load_balance()

 {
 {

-    // fixme: shall we do something special when duration is 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));
-    MSG_task_execute(task);
-    MSG_task_destroy(task);
+    if (lb_iter == 1)           // warn only once
+        XBT_WARN("process::load_balance() is a no-op!");

 }
 
 }
 

-double process::load_balance(double /*my_load*/)
+void process::send(neighbor& nb, double amount)

 {
 {

-    return 0.0;
+    set_load(get_load() - amount);
+    nb.set_to_send(nb.get_to_send() + amount);
+    nb.set_load(nb.get_load() + amount);

 }
 
 }
 

-void process::send1_no_bookkeeping(neighbor& nb)
+#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

 {
 {

-    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);
-    }
+    print_loads_generic(neigh, verbose, logp, cat);

 }
 
 }
 

-void process::send1_bookkeeping(neighbor& nb)
+void process::print_loads_p(bool verbose,
+                            e_xbt_log_priority_t logp,
+                            xbt_log_category_t cat) const

 {
 {

-    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;
-    }
-    if (load_to_send > 0.0)
-        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
+    print_loads_generic(pneigh, verbose, logp, cat);

 }
 
 }
 

-void process::send()
+#undef print_loads_generic
+
+void process::ctrl_send(neighbor& nb)

 {
 {

-    // fixme: shall we send data at all iterations?
+    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) {
     if (opt::bookkeeping) {

-        std::for_each(neigh.begin(), neigh.end(),
-                      std::tr1::bind(&process::send1_bookkeeping,
-                                     this, std::tr1::placeholders::_1));
-    } else {
-        std::for_each(neigh.begin(), neigh.end(),
-                      std::tr1::bind(&process::send1_no_bookkeeping,
-                                     this, std::tr1::placeholders::_1));
+        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));
+        }

     }
 }
 
     }
 }
 

-// Returns false if a CLOSE message was received. 
-bool process::receive(bool wait_for_close)
+void process::data_send(neighbor& nb)

 {
 {

-    bool result = true;
-    message* msg;
-    m_host_t from;
-    while ((ctrl_close_pending ||
-            data_close_pending) && comm.recv(msg, from, wait_for_close)) {
-        DEBUG2("received %s from %s",
-               msg->to_string().c_str(), MSG_host_get_name(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:
-            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;
+    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;

         }
         }

-        delete msg;
+    } else {
+        load_to_send = nb.get_to_send();
+        nb.set_to_send(0.0);

     }
     }

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

 }
 
 }
 

-void process::finalize1(neighbor& nb)
+void process::ctrl_close(neighbor& nb)

 {
 {

-    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));    
+    comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));

 }
 
 }
 

-void process::finalize()
+void process::data_close(neighbor& nb)

 {
 {

-    DEBUG2("send CLOSE to %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    std::for_each(neigh.begin(), neigh.end(),
-                  std::tr1::bind(&process::finalize1,
-                                 this, std::tr1::placeholders::_1));
+    comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
+}

 
 

-    DEBUG2("wait for CLOSE from %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    receive(true);
+void process::ctrl_receive(double timeout)
+{
+    message* msg;
+    m_host_t from;

 
 

-    comm.flush(true);
+    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::print_loads(e_xbt_log_priority_t logp)
+void process::data_receive(double timeout)

 {
 {

-    if (!LOG_ISENABLED(logp))
-        return;
+    message* msg;
+    m_host_t from;

 
 

-    std::ostringstream oss;
-    if (neigh.empty()) {
-        oss << "no neighbor!";
-    } else {
-        std::transform(neigh.begin(), neigh.end() - 1,
-                       std::ostream_iterator<double>(oss, ", "),
-                       std::tr1::mem_fn(&neighbor::get_load));
-        oss << neigh.back().get_load();
+    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;

     }
     }

-    LOG1(logp, "Neighbor loads: %s", oss.str().c_str());

 }
 
 }
 

-void process::insert_neighbor_in_map(neighbor& nb)
+void process::handle_message(message* msg, m_host_t from)

 {
 {

-    neighbor* nbp = &nb;
-    m_host_t host = MSG_get_host_by_name(nb.get_name());
-    rev_neigh.insert(std::make_pair(host, nbp));
+    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:
 }
 
 // Local variables: