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

diff --git a/hostdata.cpp b/hostdata.cpp
index 96831f0..403e13c 100644
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,42 +1,62 @@
-#include "hostdata.h"
-
-#include <xbt/log.h>
+#include <algorithm>
+#include <cstring>
+#include <functional>
 #include <stdexcept>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
+
+#include "misc.h"
+#include "options.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+#include "hostdata.h"
 
-hostdata* hostdata::instances = NULL;
+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();
-    VERB1("Got %d hosts.", nhosts);
+    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;
+    XBT_LOG(logp, "Got %zu hosts.", hosts.size());
     for (int i = 0; i < nhosts; i++) {
-        hostdata* h = new hostdata(host_list[i]);
-        MSG_host_set_data(host_list[i], h);
-        VERB2("Host #%d named \"%s\".", i, h->get_name());
-        h->next = instances;
-        instances = h;
+        XBT_LOG(logp, "Host #%d named \"%s\".", i, hosts[i].get_name());
     }
-    xbt_free(host_list);
 }
 
 void hostdata::destroy()
 {
-    while (instances) {
-        hostdata* h = instances;
-        instances = h->next;
-        delete h;
-    }
+    // hosts are automatically destroyed...
 }
 
-hostdata::hostdata(m_host_t host)
-    : next(NULL)
-    , name(MSG_host_get_name(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")
 {
+    MSG_host_set_data(host, this);
 }
 
 hostdata::~hostdata()