Rename process::send() -> process::send_all().

[loba.git] / process.h

diff --git a/process.h b/process.h
index c30b24374e0aed763bb626ed6d087350b1dbc548..a197e9afeb54c505bd6ab47e07481c92e6b1bafe 100644 (file)
--- a/process.h
+++ b/process.h
@@ -16,15 +16,20 @@
 #include <xbt/log.h>
 #include "communicator.h"
 #include "neighbor.h"
 #include <xbt/log.h>
 #include "communicator.h"
 #include "neighbor.h"

+#include "options.h"

 
 class process {
 public:
 
 class process {
 public:

-    static double get_total_load_init() { return total_load_init; }
-    static double get_total_load_exit() { return total_load_exit; }
+    static double get_total_load_init()    { return total_load_init;    }
+    static double get_total_load_running() { return total_load_running; }
+    static double get_total_load_exit()    { return total_load_exit;    }

 
     process(int argc, char* argv[]);
     virtual ~process();
 
 
     process(int argc, char* argv[]);
     virtual ~process();
 

+    double get_comp() const                { return comp; }
+    double get_load() const                { return load; }
+

     int run();
 
 protected:
     int run();
 
 protected:


@@ -48,8 +53,9 @@ protected:
                        xbt_log_category_t cat = _XBT_LOGV(default)) const;
 
 private:
                        xbt_log_category_t cat = _XBT_LOGV(default)) const;
 
 private:

-    static double total_load_init; // sum of neighbor loads at init
-    static double total_load_exit; // sum of neighbor loads at exit
+    static double total_load_init; // sum of process loads at init
+    static double total_load_running; // sum of loads while running
+    static double total_load_exit; // sum of process loads at exit

 
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
 
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter


@@ -62,15 +68,20 @@ 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
+
+    unsigned lb_iter;           // counter of load-balancing iterations
+    unsigned comp_iter;         // counter of computation iterations

 
 

-    unsigned iter;              // counter of iterations
+    double comp;                // total computing done so far (flops)

 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
     double load;                // current load
     double expected_load;       // expected load in bookkeeping mode
 
 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
     double load;                // current load
     double expected_load;       // expected load in bookkeeping mode
 

+    double& lb_load() { return opt::bookkeeping ? expected_load : load; }
+

     // The load balancing algorithm comes here...
     // Parameter "my_load" is the load to take into account for myself
     // (may be load or expected load).
     // The load balancing algorithm comes here...
     // Parameter "my_load" is the load to take into account for myself
     // (may be load or expected load).


@@ -83,11 +94,15 @@ private:
     // Send procedures, with helpers for bookkeeping mode or not
     void send1_no_bookkeeping(neighbor& nb);
     void send1_bookkeeping(neighbor& nb);
     // Send procedures, with helpers for bookkeeping mode or not
     void send1_no_bookkeeping(neighbor& nb);
     void send1_bookkeeping(neighbor& nb);

-    void send();
+    void send_all();
+
+    // 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.
-    enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
-    void receive(recv_wait_mode wait);
+    // Receive procedure
+    // Parameter "timeout" may be 0 for non-blocking operation, -1 for
+    // infinite waiting, or any positive timeout.
+    void receive(double timeout);

 
     // 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.