Revise process::receive and get rid of WAIT_FOR_CLOSE.

[loba.git] / process.h

diff --git a/process.h b/process.h
index c72fdf20e82094f4365672beb27074e25b34e8ab..b15f98297cc540481516b4fa0bd3052e5a4d57f2 100644 (file)
--- a/process.h
+++ b/process.h
@@ -66,10 +66,10 @@ private:
     int data_close_pending;     // number of "close" messages to wait
                                 // on data channel
     bool close_received;        // true if we received a "close" message
     int data_close_pending;     // number of "close" messages to wait
                                 // on data channel
     bool close_received;        // true if we received a "close" message

-    bool may_receive;           // true if there remains neighbors to listen for

     bool finalizing;            // true when finalize() is running
 
     bool finalizing;            // true when finalize() is running
 

-    unsigned iter;              // counter of iterations
+    unsigned lb_iter;           // counter of load-balancing iterations
+    unsigned comp_iter;         // counter of computation iterations

 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages


@@ -90,9 +90,11 @@ private:
     void send1_bookkeeping(neighbor& nb);
     void send();
 
     void send1_bookkeeping(neighbor& nb);
     void send();
 

-    // Receive procedure: wait (or not) for a message to come.
-    enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
-    void receive(recv_wait_mode wait);
+    // Returns true if there remains neighbors to listen for
+    bool may_receive() { return ctrl_close_pending || data_close_pending; }
+
+    // Receive procedure: wait (or not) for a message to come
+    void receive(bool wait);

 
     // Finalize sends a "close" message to each neighbor and wait for
     // all of them to answer.
 
     // Finalize sends a "close" message to each neighbor and wait for
     // all of them to answer.