Wip++...

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index d1576cef6f6330589d79edaec9d2e7a396045163..e9e234864dfbe733623aeb3ad9edb128a8658e52 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,25 +1,25 @@
 #include <algorithm>
 #include <algorithm>

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

 #include <iterator>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
 #include <iterator>
 #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);
 
 #include "misc.h"
 #include "options.h"
 #include "process.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
 

-struct message {
-    double measure;
-    double transfer;
-};
-
-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]) >> load))
         throw std::invalid_argument("bad or missing initial load");

+

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

+    expected_load = load;
+    ctrl_close_pending = data_close_pending = neigh.size();
+

     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;


@@ -27,11 +27,11 @@ process::process(int argc, char *argv[])
     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::transform(neigh.begin(), neigh.end() - 1,

-                       std::ostream_iterator<std::string>(oss, ", "),
-                       std::mem_fun_ref(&neighbor::getName));
-        oss << neigh.back().getName();
+                       std::ostream_iterator<const char*>(oss, ", "),
+                       std::tr1::mem_fn(&neighbor::get_name));
+        oss << neigh.back().get_name();

     }
     LOG1(logp, "Got %s.", oss.str().c_str());
     print_loads(logp);
     }
     LOG1(logp, "Got %s.", oss.str().c_str());
     print_loads(logp);


@@ -43,9 +43,21 @@ int process::run()
 
     int n = 100;
     while (n--) {
 
     int n = 100;
     while (n--) {

-        compute();
-        receive();
+        if (opt::bookkeeping)
+            INFO2("current load: %g ; expected: %g", load, expected_load);
+        else
+            INFO1("current load: %g", load);
+
+        if (load > 0)
+            compute();
+        else
+            xbt_sleep(100);        // fixme
+        if (!receive(false))
+            n = 0;

     }
     }

+    DEBUG0("going to finalize.");
+    finalize();
+

     //    MSG_process_sleep(100.0);   // xxx
     /* xxx:
      * while (there is something to do) {
     //    MSG_process_sleep(100.0);   // xxx
     /* xxx:
      * while (there is something to do) {


@@ -54,6 +66,8 @@ int process::run()
      *    compute load balancing;
      *    send tasks to neighbors;
      * }
      *    compute load balancing;
      *    send tasks to neighbors;
      * }

+     * finalize;
+     * wait for pending messages;

      */
 
     /* Open Questions :
      */
 
     /* Open Questions :


@@ -62,46 +76,88 @@ int process::run()
      * - how to manage link failures ?
      */
 
      * - how to manage link failures ?
      */
 

-    // xxx: shall we retrieve pending tasks?
-
+    DEBUG0("done.");

     return 0;
 }
 
     return 0;
 }
 

-void process::receive()
-{
-    m_task_t task;
-    while ((task = comm.recv())) {
-        message *msg = (message *)MSG_task_get_data(task);
-        DEBUG3("Received load: %g, info: %g from %s",
-               msg->transfer, msg->measure,
-               MSG_host_get_name(MSG_task_get_source(task)));
-        load += msg->transfer;
-        // fixme: what is xxx ???
-        // neigh[xxx].setLoad(msg->measure);
-    }
-}
-

 void process::compute()
 {
     double duration = opt::comp_cost(load);
     m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
 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" : "");
+    DEBUG2("compute %g flop%s.", duration, ESSE(duration));

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

+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)) {
+        switch (msg->get_type()) {
+        case message::INFO:
+            DEBUG0("received INFO");
+            // fixme: update neighbor
+            // need a map m_host_t -> neighbor&
+            break;
+        case message::CREDIT:
+            DEBUG0("received CREDIT");
+            expected_load += msg->get_amount();
+            break;
+        case message::LOAD:
+            DEBUG0("received LOAD");
+            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();
+            result = false;
+            break;
+        case message::DATA_CLOSE:
+            DEBUG0("received DATA_CLOSE");
+            if (--data_close_pending == 1)
+                comm.next_close_on_data_is_last();
+            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.wait_for_sent();
+}
+

 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::getLoad));
-        oss << neigh.back().getLoad();
+                       std::tr1::mem_fn(&neighbor::get_load));
+        oss << neigh.back().get_load();

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