X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/163f27d1800fc613f521114ccd6b89ebf394746e..88921c948c99bfaf470e528e6e6d004c22905a40:/process.h?ds=sidebyside

diff --git a/process.h b/process.h
index 8a9e74c..ff8b751 100644
--- 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;      }
+    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;  }
@@ -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_convergence() const         { return convergence;          }
 
     int run();
 
@@ -82,6 +85,9 @@ private:
     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;
+
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
@@ -97,6 +103,8 @@ private:
 
     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
@@ -104,6 +112,8 @@ private:
     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;
 
@@ -120,7 +130,9 @@ private:
         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) {