X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/245565c060611ddfed5067ab4000e91e440c402c..1789eecd7c4b239e5a521231387b9d30731cdf64:/process.h?ds=inline

diff --git a/process.h b/process.h
index 5e1faa6..25d6c44 100644
--- a/process.h
+++ b/process.h
@@ -22,6 +22,7 @@
 #include "msg_thread.h"
 #include "neighbor.h"
 #include "options.h"
+#include "simgrid_features.h"
 #include "synchro.h"
 
 class process {
@@ -97,14 +98,15 @@ private:
 
     static int process_counter;
     static double total_load_average;
+    static double average_load_ratio;
     static double load_diff_threshold;
 
     static std::atomic<int> convergence_counter;
 
-    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    typedef MAP_TEMPLATE<msg_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
-    rev_neigh_type rev_neigh;   // map m_host_t -> neighbor
+    rev_neigh_type rev_neigh;   // map msg_host_t -> neighbor
 
     communicator comm;          // communicator for this process
     int ctrl_close_pending;     // number of "close" messages to wait
@@ -127,6 +129,7 @@ private:
 
     double idle_duration;       // how long we had nothing to compute
     double convergence;         // date when convergence was achieved, or -1.0
+    int local_convergence_counter; // number of iterations since convergence
 
     mutex_t mutex;              // synchronization between threads
     condition_t cond;
@@ -196,7 +199,7 @@ private:
     // infinite waiting, or any positive timeout.
     void ctrl_receive(double timeout);
     void data_receive(double timeout);
-    void handle_message(message* msg, m_host_t from);
+    void handle_message(message* msg, msg_host_t from);
 };
 
 template <typename Compare>