Remove pointless struct keyword.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 96831f00a305d3d2906d1fb773e3c392f2ab574d..787b7ab926a3804c961c7ba3dd7c1a53e4b84671 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,42 +1,58 @@
-#include "hostdata.h"
-
-#include <xbt/log.h>
+#include <cstring>
+#include <algorithm>

 #include <stdexcept>
 #include <stdexcept>

+#include <xbt/log.h>
+#include <xbt/sysdep.h>

 
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
+
+#include "misc.h"
+#include "options.h"
+
+#include "hostdata.h"

 
 

-hostdata* hostdata::instances = NULL;
+std::vector<hostdata> hostdata::hosts;
+
+// 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;
+    }
+};

 
 void hostdata::create()
 {
     int nhosts = MSG_get_host_number();
     m_host_t* host_list = MSG_get_host_table();
 
 void hostdata::create()
 {
     int nhosts = MSG_get_host_number();
     m_host_t* host_list = MSG_get_host_table();

-    VERB1("Got %d hosts.", nhosts);
+    // only sort hosts for automatically created deployment
+    if (opt::auto_depl::enabled)
+        std::sort(host_list, host_list + nhosts, m_host_less());
+    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++) {
     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()
 {
 }
 
 void hostdata::destroy()
 {

-    while (instances) {
-        hostdata* h = instances;
-        instances = h->next;
-        delete h;
-    }
+    // hosts are automatically destroyed...

 }
 
 hostdata::hostdata(m_host_t host)
 }
 
 hostdata::hostdata(m_host_t host)

-    : next(NULL)
-    , name(MSG_host_get_name(host))
+    : name(MSG_host_get_name(host))

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

+    MSG_host_set_data(host, this);

 }
 
 hostdata::~hostdata()
 }
 
 hostdata::~hostdata()