Move sleep between iterations in a better place.

[loba.git] / process.h

diff --git a/process.h b/process.h
index b15f98297cc540481516b4fa0bd3052e5a4d57f2..fb1fe3f377f9626a5af4fc0bc204e78c5691c5a9 100644 (file)
--- a/process.h
+++ b/process.h
@@ -16,6 +16,7 @@
 #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:


@@ -26,6 +27,7 @@ public:
     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();
     double get_load() const                { return load; }
 
     int run();


@@ -52,7 +54,7 @@ protected:
 
 private:
     static double total_load_init; // sum of process loads at init
 
 private:
     static double total_load_init; // sum of process loads at init

-    static double total_load_running; // summ of loads while running
+    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;
     static double total_load_exit; // sum of process loads at exit
 
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;


@@ -71,11 +73,15 @@ private:
     unsigned lb_iter;           // counter of load-balancing iterations
     unsigned comp_iter;         // counter of computation iterations
 
     unsigned lb_iter;           // counter of load-balancing iterations
     unsigned comp_iter;         // counter of computation 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).


@@ -93,8 +99,10 @@ private:
     // Returns true if there remains neighbors to listen for
     bool may_receive() { return ctrl_close_pending || data_close_pending; }
 
     // 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);
+    // 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.