Cleanup, no functional change (no bug fixed too).

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 4ee3647d6895c4eef6586f92f29ffc498b45b14e..a24d6ebcbfb5eae01f098611a3373a00f06a872f 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,60 +1,126 @@
 #include <algorithm>
 #include <algorithm>

-#include <functional>
+#include <tr1/functional>

 #include <iterator>
 #include <iterator>

+#include <numeric>

 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>
 #include <stdexcept>
 #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 "process.h"
 
 #include "process.h"
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+double process::total_load_init = 0.0;
+double process::total_load_exit = 0.0;

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

-        throw std::invalid_argument("bad or missing initial load");
+        throw std::invalid_argument("bad or missing initial load parameter");
+

     neigh.assign(argv + 2, argv + argc);
     neigh.assign(argv + 2, argv + argc);

+
+    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));
+    }
+
+    prev_load_broadcast = -1;   // force sending of load on first send()

     expected_load = load;
     expected_load = load;

+    total_load_init += 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();
+    }
+    close_received = false;
+    may_receive =  (neigh.size() > 0); // the same as (ctrl_close_pending ||
+                                       //              data_close_pending)
+    if (may_receive)
+        comm.listen();
+

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

-    LOG1(logp, "My initial load is: %g", load);

     std::ostringstream oss;
     oss << neigh.size() << " neighbor";
     if (!neigh.empty()) {
     std::ostringstream oss;
     oss << neigh.size() << " neighbor";
     if (!neigh.empty()) {

-        oss << (neigh.size() > 1 ? "s: " : ": ");
+        oss << ESSE(neigh.size()) << ": ";

         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),

-                       std::mem_fun_ref(&neighbor::get_name));
+                       std::tr1::mem_fn(&neighbor::get_name));

         oss << neigh.back().get_name();
     }
     LOG1(logp, "Got %s.", oss.str().c_str());
         oss << neigh.back().get_name();
     }
     LOG1(logp, "Got %s.", oss.str().c_str());

-    print_loads(logp);
+    print_loads(true, logp);
+}
+
+process::~process()
+{
+    total_load_exit += load;

 }
 
 int process::run()
 {
 }
 
 int process::run()
 {

-    INFO0("Coucou !");
+    INFO1("Initial load: %g", load);
+    VERB0("Starting...");
+    iter = 0;
+    bool one_more = true;
+    do {
+        ++iter;

 
 

-    int n = 100;
-    while (n--) {
-        if (load > 0)
-            compute();
+        if (opt::log_rate && iter % opt::log_rate == 0) {
+            if (opt::bookkeeping)
+                INFO3("(%u) current load: %g ; expected: %g",
+                      iter, load, expected_load);
+            else
+                INFO2("(%u) current load: %g",
+                      iter, load);
+        }
+        print_loads(true, xbt_log_priority_debug);
+
+        if (opt::bookkeeping)
+            expected_load -= load_balance(expected_load);

         else
         else

-            xbt_sleep(0.5);     // fixme
-        receive();
-    }
-    //    MSG_process_sleep(100.0);   // xxx
-    /* xxx:
-     * while (there is something to do) {
-     *    compute some task;
-     *    get received tasks;
-     *    compute load balancing;
-     *    send tasks to neighbors;
-     * }
-     */
+            load -= load_balance(load);
+
+        send();
+        compute();
+
+// NDS for Need To Send
+#define NDS ((opt::bookkeeping ? expected_load : load) != prev_load_broadcast)
+        do {
+            // General idea: block on receiving unless there is
+            // something to compute, or to send, or we must exit.
+
+            // fixme: review this chunk, and remove this NDS macro!
+
+            // FIXME: HAD A DEADLOCK HERE...
+
+            bool recv_wait = (load == 0 && !NDS);
+            DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT");
+            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;
+            
+        } while (one_more && may_receive && load == 0 && !NDS);
+        DEBUG0("RECEIVE LOOP ENDED");
+#undef NDS
+
+    } while (one_more);
+    VERB0("Going to finalize...");
+    finalize();

 
     /* Open Questions :
      * - definition of load on heterogeneous hosts ?
 
     /* Open Questions :
      * - definition of load on heterogeneous hosts ?


@@ -62,58 +128,186 @@ int process::run()
      * - how to manage link failures ?
      */
 
      * - how to manage link failures ?
      */
 

-    // xxx: shall we retrieve pending tasks?
-
+    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;
 }
 
     return 0;
 }
 

-void process::receive()
+double process::sum_of_to_send() const

 {
 {

-    bool received;
-    do {
-        double amount;
-        m_host_t from;
-        received = false;
-        if (comm.recv_info(amount, from)) {
-            // fixme: update neighbor
-            received = true;
-        }
-        if (comm.recv_credit(amount, from)) {
-            expected_load += amount;
-            received = true;
-        }
-        if (comm.recv_load(amount, from)) {
-            load += amount;
-            received = true;
-        }
-    } while (received);
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+
+    return std::accumulate(neigh.begin(), neigh.end(), 0.0,
+                           bind(std::plus<double>(),
+                                _1, bind(&neighbor::get_to_send, _2)));
+}
+
+double process::load_balance(double /*my_load*/)
+{
+    if (iter == 1)
+        WARN0("process::load_balance is a no-op!");
+    return 0.0;

 }
 
 void process::compute()
 {
 }
 
 void process::compute()
 {

-    double duration = opt::comp_cost(load);
-    m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
-    DEBUG2("Compute %g flop%s.", duration, duration > 1 ? "s" : "");
-    MSG_task_execute(task);
-    MSG_task_destroy(task);
+    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));
+        MSG_task_execute(task);
+        MSG_task_destroy(task);
+    } else {
+        DEBUG0("nothing to compute !");
+    }

 }
 
 }
 

-void process::print_loads(e_xbt_log_priority_t logp)
+void process::send1_no_bookkeeping(neighbor& nb)

 {
 {

-    if (!LOG_ISENABLED(logp))
-        return;
-    std::ostringstream oss;
-    if (neigh.empty()) {
-        oss << "no neighbor!";
+    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);
+    }
+}
+
+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 {
     } else {

-        std::transform(neigh.begin(), neigh.end() - 1,
-                       std::ostream_iterator<double>(oss, ", "),
-                       std::mem_fun_ref(&neighbor::get_load));
-        oss << neigh.back().get_load();
+        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;

     }
     }

-    LOG1(logp, "Neighbor loads: %s", oss.str().c_str());
+    if (load_to_send > 0.0)
+        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));

 }
 
 }
 

+void process::send()
+{
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+
+    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;
+    }
+}
+
+void process::receive(recv_wait_mode wait)
+{
+    // DEBUG1("go for receive(%s)",
+    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
+    message* msg;
+    m_host_t from;
+    bool do_loop = may_receive;
+    while (do_loop && 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);
+            close_received = true;
+            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);
+            close_received = true;
+            break;
+        }
+        delete msg;
+        may_receive = (ctrl_close_pending || data_close_pending);
+        do_loop = (wait == WAIT_FOR_CLOSE) && may_receive;
+    }
+}
+
+void process::finalize1(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));    
+}
+
+void process::finalize()
+{
+    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);
+}
+
+#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:");                           \
+        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: