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

diff --git a/process.h b/process.h
index ff8b751..25d6c44 100644
--- a/process.h
+++ b/process.h
@@ -16,15 +16,20 @@
 #include <vector>
 #include <msg/msg.h>
 #include <xbt/log.h>
+#include "atomic_compat.h"
 #include "communicator.h"
 #include "misc.h"
 #include "msg_thread.h"
 #include "neighbor.h"
 #include "options.h"
+#include "simgrid_features.h"
 #include "synchro.h"
 
 class process {
 public:
+    static void set_proc_mutex(mutex_t* m) { proc_mutex = m;            }
+
+    // Note: normally used with proc_mutex locked.
     static double get_total_load_init()    { return total_load_init;    }
     static double get_total_load_running() { return total_load_running; }
     static double get_total_load_exit()    { return total_load_exit;    }
@@ -36,6 +41,7 @@ public:
     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_iter_deviation() const;
     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;  }
@@ -44,6 +50,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_idle_duration() const       { return idle_duration;        }
     double get_convergence() const         { return convergence;          }
 
     int run();
@@ -81,17 +88,25 @@ protected:
                        xbt_log_category_t cat = _XBT_LOGV(default)) const;
 
 private:
+    static mutex_t *proc_mutex; // protect access to global variables
+                                // (must be set before constructing
+                                // the first object!)
+
     static double total_load_init; // sum of process loads at init
     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 average_load_ratio;
+    static double load_diff_threshold;
 
-    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    static std::atomic<int> convergence_counter;
+
+    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
@@ -112,7 +127,9 @@ private:
     double expected_load;       // expected load in bookkeeping mode
     double received_load;       // load received from neighbors
 
+    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;
@@ -159,6 +176,9 @@ private:
     // Simulate computation loop
     void compute_loop();
 
+    // Check for convergence
+    void convergence_check();
+
     // Check if we need to stop
     bool still_running();
 
@@ -179,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>