Wip++...

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index b30fab4b0a9d8a43838e1d346bade1e06baa64f8..e9e234864dfbe733623aeb3ad9edb128a8658e52 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,8 +15,11 @@ 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();
+

     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;


@@ -24,10 +27,10 @@ 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::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());


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

+        if (opt::bookkeeping)
+            INFO2("current load: %g ; expected: %g", load, expected_load);
+        else
+            INFO1("current load: %g", load);
+

         if (load > 0)
             compute();
         else
         if (load > 0)
             compute();
         else

-            xbt_sleep(0.5);     // fixme
-        receive();
+            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) {


@@ -64,56 +76,87 @@ 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()
+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, ESSE(duration));
+    MSG_task_execute(task);
+    MSG_task_destroy(task);
+}
+
+bool process::receive(bool wait_for_close)

 {
 {

+    bool result = true;

     message* msg;
     m_host_t from;
     message* msg;
     m_host_t from;

-    while (comm.recv(msg, from)) {
+    while ((ctrl_close_pending ||
+            data_close_pending) && comm.recv(msg, from, wait_for_close)) {

         switch (msg->get_type()) {
         case message::INFO:
         switch (msg->get_type()) {
         case message::INFO:

+            DEBUG0("received INFO");

             // fixme: update neighbor
             // fixme: update neighbor

+            // need a map m_host_t -> neighbor&

             break;
         case message::CREDIT:
             break;
         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;
             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;
     }
         }
         delete msg;
     }

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

 }
 
 void process::finalize()
 {
 }
 
 void process::finalize()
 {

-    // fixme
+    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::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());