change in fair strategy

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 5f393bdb39abb837b279a21e285ee293483fcbea..53cbb59c7434da4a84beb5d2971e8c98ea7ae910 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -40,8 +40,6 @@ process::process(int argc, char* argv[])
 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;

-    may_receive =  (neigh.size() > 0); // the same as (ctrl_close_pending ||
-                                       //              data_close_pending)

     finalizing = false;
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     finalizing = false;
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;


@@ -104,17 +102,17 @@ int process::run()
 
         // block on receiving unless there is something to compute or
         // to send
 
         // 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));
-        receive(recv_wait? WAIT: NO_WAIT);
+        bool wait = (load == 0 &&
+                     ((opt::bookkeeping ? expected_load : load)
+                      == prev_load_broadcast));
+        receive(wait);

 
         // one of our neighbor is finalizing
         if (opt::exit_on_close && close_received)
             break;
 
         // have no load and cannot receive anything
 
         // one of our neighbor is finalizing
         if (opt::exit_on_close && close_received)
             break;
 
         // have no load and cannot receive anything

-        if (load == 0.0 && !may_receive)
+        if (load == 0.0 && !may_receive())

             break;
 
         // fixme: this check should be implemented with a distributed
             break;
 
         // fixme: this check should be implemented with a distributed


@@ -231,16 +229,12 @@ void process::send()
     }
 }
 
     }
 }
 

-void process::receive(recv_wait_mode wait)
+void process::receive(bool 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)) {
+    while (may_receive() && comm.recv(msg, from, wait)) {

         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];


@@ -259,18 +253,15 @@ void process::receive(recv_wait_mode wait)
         }
         case message::CTRL_CLOSE:
             ctrl_close_pending--;
         }
         case message::CTRL_CLOSE:
             ctrl_close_pending--;

-            DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);

             close_received = true;
             break;
         case message::DATA_CLOSE:
             data_close_pending--;
             close_received = true;
             break;
         case message::DATA_CLOSE:
             data_close_pending--;

-            DEBUG1("data_close_pending = %d", data_close_pending);

             close_received = true;
             break;
         }
         delete msg;
             close_received = true;
             break;
         }
         delete msg;

-        may_receive = (ctrl_close_pending || data_close_pending);
-        do_wait = (wait == WAIT_FOR_CLOSE);
+        wait = false;           // only wait on first recv

     }
 }
 
     }
 }
 


@@ -295,7 +286,8 @@ void process::finalize()
 
     DEBUG2("wait for CLOSE from %lu neighbor%s",
            (unsigned long )neigh.size(), ESSE(neigh.size()));
 
     DEBUG2("wait for CLOSE from %lu neighbor%s",
            (unsigned long )neigh.size(), ESSE(neigh.size()));

-    receive(WAIT_FOR_CLOSE);
+    while (may_receive())
+        receive(true);

 
     comm.flush(true);
 }
 
     comm.flush(true);
 }