In compute_loop(), wait the duration of an *lb* iteration if there is nothing to do.

[loba.git] / process.h

diff --git a/process.h b/process.h
index 57ece07203d300e2d264d8096c3958d654e34439..d2f12292caaf9c62c65115ad5b667133604cd9f4 100644 (file)
--- a/process.h
+++ b/process.h
@@ -34,6 +34,8 @@ public:
 
     double get_real_load() const           { return real_load;            }
     double get_comp_amount() const         { return acc.comp_amount;      }
 
     double get_real_load() const           { return real_load;            }
     double get_comp_amount() const         { return acc.comp_amount;      }

+    unsigned get_comp_iter() const         { return comp_iter;            }
+    unsigned get_all_comp_iter() const     { return all_comp_iter;        }

     double get_data_send_amount() const    { return acc.data_send.amount; }
     double get_data_recv_amount() const    { return acc.data_recv.amount; }
     unsigned get_data_send_count() const   { return acc.data_send.count;  }
     double get_data_send_amount() const    { return acc.data_send.amount; }
     double get_data_recv_amount() const    { return acc.data_recv.amount; }
     unsigned get_data_send_count() const   { return acc.data_send.count;  }


@@ -42,6 +44,7 @@ public:
     double get_ctrl_recv_amount() const    { return acc.ctrl_recv.amount; }
     unsigned get_ctrl_send_count() const   { return acc.ctrl_send.count;  }
     unsigned get_ctrl_recv_count() const   { return acc.ctrl_recv.count;  }
     double get_ctrl_recv_amount() const    { return acc.ctrl_recv.amount; }
     unsigned get_ctrl_send_count() const   { return acc.ctrl_send.count;  }
     unsigned get_ctrl_recv_count() const   { return acc.ctrl_recv.count;  }

+    double get_convergence() const         { return convergence;          }

 
     int run();
 
 
     int run();
 


@@ -82,6 +85,10 @@ private:
     static double total_load_running; // sum of loads while running
     static double total_load_exit; // sum of process loads at exit
 
     static double total_load_running; // sum of loads while running
     static double total_load_exit; // sum of process loads at exit
 

+    static int process_counter;
+    static double total_load_average;
+    static double load_diff_threshold;
+

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


@@ -97,6 +104,8 @@ 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

+    unsigned all_comp_iter;     // counter of computation iterations
+                                // (counting empty iterations too)

 
     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


@@ -104,6 +113,8 @@ private:
     double expected_load;       // expected load in bookkeeping mode
     double received_load;       // load received from neighbors
 
     double expected_load;       // expected load in bookkeeping mode
     double received_load;       // load received from neighbors
 

+    double convergence;         // date when convergence was achieved, or -1.0
+

     mutex_t mutex;              // synchronization between threads
     condition_t cond;
 
     mutex_t mutex;              // synchronization between threads
     condition_t cond;
 


@@ -120,7 +131,9 @@ private:
         mesg_accounting ctrl_recv; // ctrl message received
         accounting(): comp_amount(0.0) { }
     };
         mesg_accounting ctrl_recv; // ctrl message received
         accounting(): comp_amount(0.0) { }
     };

-    accounting acc;
+    accounting acc;             // use a structure so that it is
+                                // automatically initialized a
+                                // construction

 
     void add_comp_amount(double amount) { acc.comp_amount += amount; }
     void add_data_send_mesg(double amount) {
 
     void add_comp_amount(double amount) { acc.comp_amount += amount; }
     void add_data_send_mesg(double amount) {


@@ -147,12 +160,18 @@ private:
     // Simulate computation loop
     void compute_loop();
 
     // Simulate computation loop
     void compute_loop();
 

+    // Check for convergence
+    void convergence_check();
+

     // Check if we need to stop
     bool still_running();
 
     // Returns the sum of "to_send" for all neighbors.
     double get_sum_of_to_send() const;
 
     // Check if we need to stop
     bool still_running();
 
     // Returns the sum of "to_send" for all neighbors.
     double get_sum_of_to_send() const;
 

+    // Compute load_to_send (for data_send), subject to the execution parameters
+    static double compute_load_to_send(double desired);
+

     // Send procedures
     void ctrl_send(neighbor& nb);
     void data_send(neighbor& nb);
     // Send procedures
     void ctrl_send(neighbor& nb);
     void data_send(neighbor& nb);