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

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 5498ba8ad64127573f17748446880bbef4719e9e..88ca6fde2f197305879f8dea66e86521b9a74d5a 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -19,14 +19,9 @@ void hostdata::create()
     using std::placeholders::_1;
     using std::placeholders::_2;
 
     using std::placeholders::_1;
     using std::placeholders::_2;
 

-#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 7, 0)
-    int nhosts = MSG_get_host_number();
-    m_host_t* host_list = MSG_get_host_table();
-#else // API changed with SG 3.7.0

     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);
     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);

-    m_host_t* host_list = static_cast<m_host_t*>(xbt_dynar_to_array(host_dynar));
-#endif
+    msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));

     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,


@@ -51,7 +46,7 @@ void hostdata::destroy()
     // hosts are automatically destroyed...
 }
 
     // hosts are automatically destroyed...
 }
 

-hostdata::hostdata(m_host_t host)
+hostdata::hostdata(msg_host_t host)

     : name(MSG_host_get_name(host))
     , ctrl_mbox(std::string(name) + "_ctrl")
     , data_mbox(std::string(name) + "_data")
     : name(MSG_host_get_name(host))
     , ctrl_mbox(std::string(name) + "_ctrl")
     , data_mbox(std::string(name) + "_data")