Be consistent and hold mutex in any case when returning from condition_t::timedwait().

[loba.git] / process.h

diff --git a/process.h b/process.h
index 14d514f27841afb25df662e05bb4e277df749326..25d6c442ca6abb2de60417a69839ac5d7452c189 100644 (file)
--- 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 {
@@ -102,10 +103,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
@@ -198,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>