Use git diff instead of diff-index for setlocalversion.

[loba.git] / process.h

diff --git a/process.h b/process.h
index c31d21345ab6c05993b7be8bab5cff20ea4e1f8e..f01c3c62f73e6d9130bac148bcf9ac444ee603ac 100644 (file)
--- a/process.h
+++ b/process.h
@@ -1,30 +1,25 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
-#define USE_UNORDERED_MAP 1
-//#undef USE_UNORDERED_MAP
-
 #include <algorithm>
-#include <functional>
-#ifdef USE_UNORDERED_MAP
-#  include <unordered_map>
-#  define MAP_TEMPLATE std::unordered_map
-#else
-#  include <map>
-#  define MAP_TEMPLATE std::map
-#endif
+#include <atomic>
+#include <unordered_map>
 #include <vector>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <xbt/log.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;    }
@@ -83,18 +78,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 std::unordered_map<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
@@ -117,6 +119,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;
@@ -186,18 +189,16 @@ 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>
 void process::pneigh_sort_by_load(const Compare& comp)
 {
-    using std::placeholders::_1;
-    using std::placeholders::_2;
     std::sort(pneigh.begin(), pneigh.end(),
-              std::bind(comp,
-                        std::bind(&neighbor::get_load, _1),
-                        std::bind(&neighbor::get_load, _2)));
+              [&comp](const neighbor* a, const neighbor* b) {
+                  return comp(a->get_load(), b->get_load());
+              });
 }
 
 #endif // !PROCESS_H