Remove redundant includes.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index e9e234864dfbe733623aeb3ad9edb128a8658e52..ed7be055394eefc015637ae1dc927b76c984ed7d 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,29 +1,46 @@
+#include "process.h"
+

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

-#include "process.h"

 
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);

 
 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));
+    }
+

     expected_load = load;
     expected_load = 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();

 
     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()) {


@@ -37,49 +54,86 @@ process::process(int argc, char* argv[])
     print_loads(logp);
 }
 
     print_loads(logp);
 }
 

+process::~process()
+{
+}
+

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

-    INFO0("Coucou !");
+    bool one_more = true;

 
 

-    int n = 100;
-    while (n--) {
-        if (opt::bookkeeping)
-            INFO2("current load: %g ; expected: %g", load, expected_load);
-        else
-            INFO1("current load: %g", load);
+    INFO1("Initial load: %g", load);
+    VERB0("Starting...");
+    // first send() to inform neighbors about our load (force it)
+    prev_load_broadcast = !(opt::bookkeeping? expected_load: load);
+    send();
+    iter = 0;
+    while (one_more) {
+        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(xbt_log_priority_debug);

 
 

-        if (load > 0)
+        bool do_compute = load > 0.0;
+        if (do_compute) {

             compute();
             compute();

+            ++iter;
+        }
+
+        bool close_received = !receive(do_compute? NO_WAIT: WAIT);
+
+        if (opt::bookkeeping)
+            expected_load -= load_balance(expected_load);

         else
         else

-            xbt_sleep(100);        // fixme
-        if (!receive(false))
-            n = 0;
+            load -= load_balance(load);
+
+        send();
+
+        if (opt::exit_on_close && close_received)
+            one_more = false;
+        if (opt::maxiter && iter >= opt::maxiter)
+            one_more = false;

     }
     }

-    DEBUG0("going to finalize.");
+    VERB0("Going to finalize...");

     finalize();
 
     finalize();
 

-    //    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;
-     * }
-     * finalize;
-     * wait for pending messages;
-     */
-

     /* Open Questions :
      * - definition of load on heterogeneous hosts ?
      * - how to detect convergence ?
      * - how to manage link failures ?
      */
 
     /* Open Questions :
      * - definition of load on heterogeneous hosts ?
      * - how to detect convergence ?
      * - how to manage link failures ?
      */
 

-    DEBUG0("done.");
+    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;
 }
 
     return 0;
 }
 

+double process::sum_of_to_send() const
+{
+    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()
 {
     double duration = opt::comp_cost(load);
 void process::compute()
 {
     double duration = opt::comp_cost(load);


@@ -89,60 +143,124 @@ void process::compute()
     MSG_task_destroy(task);
 }
 
     MSG_task_destroy(task);
 }
 

-bool process::receive(bool wait_for_close)
+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);
+    }
+}
+
+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;
+    }
+    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;
+
+    // fixme: shall we send data at all iterations?
+    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;
+    }
+}
+
+// Returns false if a CLOSE message was received. 
+bool process::receive(recv_wait_mode wait)

 {
     bool result = true;
     message* msg;
     m_host_t from;
 {
     bool result = true;
     message* msg;
     m_host_t from;

-    while ((ctrl_close_pending ||
-            data_close_pending) && comm.recv(msg, from, wait_for_close)) {
+    bool do_recv = ctrl_close_pending || data_close_pending;
+    while (do_recv && comm.recv(msg, from, wait)) {

         switch (msg->get_type()) {
         switch (msg->get_type()) {

-        case message::INFO:
-            DEBUG0("received INFO");
-            // fixme: update neighbor
-            // need a map m_host_t -> neighbor&
+        case message::INFO: {
+            neighbor* n = rev_neigh[from];
+            n->set_load(msg->get_amount());

             break;
             break;

+        }

         case message::CREDIT:
         case message::CREDIT:

-            DEBUG0("received CREDIT");

             expected_load += msg->get_amount();
             break;
         case message::LOAD:
             expected_load += msg->get_amount();
             break;
         case message::LOAD:

-            DEBUG0("received LOAD");

             load += msg->get_amount();
             break;
         case message::CTRL_CLOSE:
             load += msg->get_amount();
             break;
         case message::CTRL_CLOSE:

-            DEBUG0("received CTRL_CLOSE");

             if (--ctrl_close_pending == 1)
                 comm.next_close_on_ctrl_is_last();
             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:
             result = false;
             break;
         case message::DATA_CLOSE:

-            DEBUG0("received DATA_CLOSE");

             if (--data_close_pending == 1)
                 comm.next_close_on_data_is_last();
             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;
             result = false;
             break;
         }
         delete msg;

+        do_recv = (wait == WAIT_FOR_CLOSE) &&
+            (ctrl_close_pending || data_close_pending);

     }
     return result;
 }
 
     }
     return result;
 }
 

+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()
 {
 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()));
     DEBUG2("send CLOSE to %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));

-    std::vector<neighbor>::iterator n;
-    for (n = neigh.begin() ; n != neigh.end() ; ++n) {
-        comm.send(n->get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
-        comm.send(n->get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
-    }
+    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()));
 
     DEBUG2("wait for CLOSE from %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));

-    receive(true);
+    receive(WAIT_FOR_CLOSE);

 
 

-    comm.wait_for_sent();
+    comm.flush(true);

 }
 
 void process::print_loads(e_xbt_log_priority_t logp)
 }
 
 void process::print_loads(e_xbt_log_priority_t logp)