Use a separate thread to handle incoming messages.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 306687f2f8dd68de8d2bf82218adff88e4ff70d8..5f393bdb39abb837b279a21e285ee293483fcbea 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -39,16 +39,10 @@ process::process(int argc, char* argv[])
     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)
     finalizing = false;
-    if (may_receive)
-        comm.listen();
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
@@ -75,17 +69,17 @@ int process::run()
 {
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
-    iter = 0;
+    comp_iter = lb_iter = 0;
     while (true) {
         if (load > 0.0) {
-            ++iter;
-            if (opt::log_rate && iter % opt::log_rate == 0) {
+            ++comp_iter;
+            if (opt::log_rate && comp_iter % opt::log_rate == 0) {
                 if (opt::bookkeeping)
-                    INFO3("(%u) current load: %g ; expected: %g",
-                          iter, load, expected_load);
+                    INFO4("(%u:%u) current load: %g ; expected: %g",
+                          comp_iter, lb_iter, load, expected_load);
                 else
                     INFO2("(%u) current load: %g",
-                          iter, load);
+                          comp_iter, load);
             }
 
             if (opt::bookkeeping)
@@ -98,19 +92,21 @@ int process::run()
             send();
             compute();
 
-            if (opt::maxiter && iter >= opt::maxiter)
-                break;
         } else {
             // send load information, and load when bookkeeping
             send();
         }
 
+        if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter)
+            break;
+        if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter)
+            break;
+
         // block on receiving unless there is something to compute or
         // to send
         bool recv_wait = (load == 0 &&
                           ((opt::bookkeeping ? expected_load : load)
                            == prev_load_broadcast));
-        DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT");
         receive(recv_wait? WAIT: NO_WAIT);
 
         // one of our neighbor is finalizing
@@ -123,6 +119,7 @@ int process::run()
 
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
+        // fixme: should this chunk be moved before call to receive() ?
         if (100.0 * total_load_running / total_load_init <=
             opt::load_ratio_threshold) {
             VERB0("No more load to balance in system, stopping.");
@@ -140,7 +137,8 @@ int process::run()
      */
 
     VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
+    INFO3("Final load after %d iteration%s: %g",
+          comp_iter, ESSE(comp_iter), load);
     if (opt::bookkeeping)
         INFO1("Expected load: %g", expected_load);
     return 0;
@@ -159,7 +157,7 @@ double process::sum_of_to_send() const
 
 double process::load_balance(double /*my_load*/)
 {
-    if (iter == 1)
+    if (lb_iter == 1)           // warn only once
         WARN0("process::load_balance is a no-op!");
     return 0.0;
 }
@@ -169,7 +167,7 @@ void process::compute()
     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));
+        DEBUG2("compute %g flop%s", duration, ESSE(duration));
         MSG_task_execute(task);
         MSG_task_destroy(task);
     } else {
@@ -235,10 +233,12 @@ void process::send()
 
 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;
+
+    DEBUG1("go for receive(%s)",
+           "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
+
     bool do_wait = (wait != NO_WAIT);
     while (may_receive && comm.recv(msg, from, do_wait)) {
         switch (msg->get_type()) {
@@ -258,15 +258,13 @@ void process::receive(recv_wait_mode wait)
             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);
+            ctrl_close_pending--;
+            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);
+            data_close_pending--;
+            DEBUG1("data_close_pending = %d", data_close_pending);
             close_received = true;
             break;
         }
@@ -290,13 +288,13 @@ void process::finalize()
     finalizing = true;
     total_load_running -= load;
 
-    DEBUG2("send CLOSE to %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
+    DEBUG2("send CLOSE to %lu neighbor%s",
+           (unsigned long )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()));
+    DEBUG2("wait for CLOSE from %lu neighbor%s",
+           (unsigned long )neigh.size(), ESSE(neigh.size()));
     receive(WAIT_FOR_CLOSE);
 
     comm.flush(true);