X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6327e2032096180078429253034afecb48208abd..18adf3ed10c9ea012f83493995691227e50d3748:/process.h?ds=sidebyside

diff --git a/process.h b/process.h
index aa9ebcb..55ee792 100644
--- a/process.h
+++ b/process.h
@@ -5,7 +5,7 @@
 //#undef USE_UNORDERED_MAP
 
 #include <algorithm>
-#include <functional>
+#include <atomic>
 #ifdef USE_UNORDERED_MAP
 #  include <unordered_map>
 #  define MAP_TEMPLATE std::unordered_map
@@ -14,14 +14,14 @@
 #  define MAP_TEMPLATE std::map
 #endif
 #include <vector>
-#include <msg/msg.h>
+#include <simgrid/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 {
@@ -102,10 +102,10 @@ private:
 
     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
@@ -128,6 +128,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;
@@ -197,18 +198,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