Wip++...

[loba.git] / process.cpp

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

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

 #include <iterator>
 #include <stdexcept>
 #include <sstream>
 #include <iterator>
 #include <stdexcept>
 #include <sstream>


@@ -15,19 +15,28 @@ 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]) >> load))
         throw std::invalid_argument("bad or missing initial load");

+

     neigh.assign(argv + 2, argv + argc);
     expected_load = load;
     neigh.assign(argv + 2, argv + argc);
     expected_load = 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();
+

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


@@ -36,25 +45,41 @@ process::process(int argc, char* argv[])
 
 int process::run()
 {
 
 int process::run()
 {

-    INFO0("Coucou !");
-
-    int n = 100;
-    while (n--) {
-        if (load > 0)
-            compute();
-        else
-            xbt_sleep(0.5);     // fixme
-        receive();
+    bool one_more = true;
+    unsigned iter = 0;
+
+    INFO1("Initial load: %g", load);
+    VERB0("Starting...");
+    while (one_more) {
+        bool close_received;
+        ++iter;
+
+        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);
+        }
+
+        compute();
+        close_received = !receive(false);
+
+        /*
+         *    compute load balancing;
+         *    send tasks to neighbors;
+         */
+
+        comm.flush(false);
+
+        if (opt::exit_on_close && close_received)
+            one_more = false;
+        if (opt::maxiter && iter >= opt::maxiter)
+            one_more = false;

     }
     }

-    //    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;
-     * }
-     */
+    VERB0("Going to finalize...");
+    finalize();

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


@@ -62,53 +87,94 @@ int process::run()
      * - how to manage link failures ?
      */
 
      * - how to manage link failures ?
      */
 

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

-void process::receive()
-{
-    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);
-}
-

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

+    // 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);
     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" : "");
+    DEBUG2("compute %g flop%s.", duration, ESSE(duration));

     MSG_task_execute(task);
     MSG_task_destroy(task);
 }
 
     MSG_task_execute(task);
     MSG_task_destroy(task);
 }
 

+
+// Returns false if a CLOSE message was received. 
+bool process::receive(bool wait_for_close)
+{
+    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:
+            // fixme: update neighbor
+            // need a map m_host_t -> neighbor&
+            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;
+    }
+    return result;
+}
+
+void process::finalize()
+{
+    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));
+    }
+
+    DEBUG2("wait for CLOSE from %d neighbor%s.",
+           (int )neigh.size(), ESSE(neigh.size()));
+    receive(true);
+
+    comm.flush(true);
+}
+

 void process::print_loads(e_xbt_log_priority_t logp)
 {
     if (!LOG_ISENABLED(logp))
         return;
 void process::print_loads(e_xbt_log_priority_t logp)
 {
     if (!LOG_ISENABLED(logp))
         return;

+

     std::ostringstream oss;
     if (neigh.empty()) {
         oss << "no neighbor!";
     } else {
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<double>(oss, ", "),
     std::ostringstream oss;
     if (neigh.empty()) {
         oss << "no neighbor!";
     } else {
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<double>(oss, ", "),

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

         oss << neigh.back().get_load();
     }
     LOG1(logp, "Neighbor loads: %s", oss.str().c_str());
         oss << neigh.back().get_load();
     }
     LOG1(logp, "Neighbor loads: %s", oss.str().c_str());