X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ba8a9c5fbc92dc95fc99d8078b3474fd2fd5a043..eed18917aff57d3045fdf6cfecbf6fb99d1e9c7b:/hostdata.cpp?ds=inline

diff --git a/hostdata.cpp b/hostdata.cpp
index c15c0ee..403e13c 100644
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,42 +1,48 @@
-#include "hostdata.h"
-
-#include <cstring>
 #include <algorithm>
+#include <cstring>
+#include <functional>
 #include <stdexcept>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
-#include "misc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
-std::vector<hostdata> hostdata::hosts;
+#include "misc.h"
+#include "options.h"
 
-// used to compare m_host_t's by name
-struct hostdata::m_host_less {
-    bool operator()(const m_host_t& a, const m_host_t& b)
-    {
-        const char* na = MSG_host_get_name(a);
-        const char* nb = MSG_host_get_name(b);
-        return strcmp(na, nb) < 0;
-    }
-};
+#include "hostdata.h"
+
+std::vector<hostdata> hostdata::hosts;
 
 void hostdata::create()
 {
+    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();
-    // fixme: only sort hosts for automatically created deployment
-    // fixme: add an option to disable sorting
-    std::sort(host_list, host_list + nhosts, m_host_less());
+    msg_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);
+    msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));
+#endif
+    // only sort hosts for automatically created deployment
+    if (opt::auto_depl::enabled)
+        std::sort(host_list, host_list + nhosts,
+                  std::bind(std::less<int>(),
+                            std::bind(strcmp,
+                                      std::bind(MSG_host_get_name, _1),
+                                      std::bind(MSG_host_get_name, _2)), 0));
     hosts.assign(host_list, host_list + nhosts);
     xbt_free(host_list);
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
         return;
-    LOG1(logp, "Got %lu hosts.", (unsigned long)hosts.size());
+    XBT_LOG(logp, "Got %zu hosts.", hosts.size());
     for (int i = 0; i < nhosts; i++) {
-        LOG2(logp, "Host #%d named \"%s\".", i, hosts[i].get_name());
+        XBT_LOG(logp, "Host #%d named \"%s\".", i, hosts[i].get_name());
     }
 }
 
@@ -45,7 +51,7 @@ void hostdata::destroy()
     // 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")