Bug fix: only send to a lesser loaded neighbor!

[loba.git] / process.h

diff --git a/process.h b/process.h
index 654237b8b9f77f2d1050f0d88a0760a097954ac8..1374bf4b9458e4f85601363651c44cb057fd4e9b 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,7 +27,8 @@ public:
     process(int argc, char* argv[]);
     virtual ~process();
 
     process(int argc, char* argv[]);
     virtual ~process();
 

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

 
     int run();
 
 
     int run();
 


@@ -37,8 +39,10 @@ protected:
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 

-    // Returns the sum of "to_send" for all neighbors.
-    double sum_of_to_send() const;
+    // Get and set current load, which may be real load, or expected
+    // load if opt::bookkeeping is true.
+    double get_load() const;
+    void set_load(double load);

 
     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,
 
     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,


@@ -52,7 +56,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;


@@ -66,20 +70,21 @@ 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
 
     bool finalizing;            // true when finalize() is running
 
     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 prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages

-    double load;                // current load
+    double real_load;           // current load

     double expected_load;       // expected load in bookkeeping mode
 
     // The load balancing algorithm comes here...
     // Parameter "my_load" is the load to take into account for myself
     double expected_load;       // expected load in bookkeeping mode
 
     // The load balancing algorithm comes here...
     // Parameter "my_load" is the load to take into account for myself

-    // (may be load or expected load).
+    // (may be real load or expected load).

     // Returns the total load sent to neighbors.
     virtual double load_balance(double my_load);
 
     // Returns the total load sent to neighbors.
     virtual double load_balance(double my_load);
 


@@ -89,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.


@@ -101,6 +110,24 @@ private:
     void finalize();
 };
 
     void finalize();
 };
 

+inline
+double process::get_load() const
+{
+    if (opt::bookkeeping)
+        return expected_load;
+    else
+        return real_load;
+}
+
+inline
+void process::set_load(double load)
+{
+    if (opt::bookkeeping)
+        expected_load = load;
+    else
+        real_load = load;
+}
+

 #endif // !PROCESS_H
 
 // Local variables:
 #endif // !PROCESS_H
 
 // Local variables: