Use a separate thread to handle incoming messages.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 0b27f0bddae784512453174ad6a47a3d7ffeda54..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();
     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;
     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))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -113,7 +107,6 @@ int process::run()
         bool recv_wait = (load == 0 &&
                           ((opt::bookkeeping ? expected_load : load)
                            == prev_load_broadcast));
         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
         receive(recv_wait? WAIT: NO_WAIT);
 
         // one of our neighbor is finalizing


@@ -174,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);
     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 {
         MSG_task_execute(task);
         MSG_task_destroy(task);
     } else {


@@ -240,10 +233,12 @@ void process::send()
 
 void process::receive(recv_wait_mode wait)
 {
 
 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;
     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()) {
     bool do_wait = (wait != NO_WAIT);
     while (may_receive && comm.recv(msg, from, do_wait)) {
         switch (msg->get_type()) {


@@ -263,15 +258,13 @@ void process::receive(recv_wait_mode wait)
             break;
         }
         case message::CTRL_CLOSE:
             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:
             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;
         }
             close_received = true;
             break;
         }


@@ -295,13 +288,13 @@ void process::finalize()
     finalizing = true;
     total_load_running -= load;
 
     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));
 
     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);
     receive(WAIT_FOR_CLOSE);
 
     comm.flush(true);