API change in SG 3.7.0: MSG_get_host_table() -> MSG_hosts_as_dynar().

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index a92527e8a0bb7555fc43a6839135cc66fe02d6ba..5498ba8ad64127573f17748446880bbef4719e9e 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,41 +1,48 @@
-#include "hostdata.h"
-
-#include <cstring>

 #include <algorithm>
 #include <algorithm>

+#include <cstring>
+#include <functional>

 #include <stdexcept>
 #include <xbt/log.h>
 #include <stdexcept>
 #include <xbt/log.h>

-#include "misc.h"
+#include <xbt/sysdep.h>

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 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()
 {
 
 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();
     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());
+#else // API changed with SG 3.7.0
+    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
+    // 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;
     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++) {
     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());

     }
 }
 
     }
 }