Use new defined variadic logging macros.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index a92527e8a0bb7555fc43a6839135cc66fe02d6ba..4d710543ce1882472d1bc0b0a654397f16894d56 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,13 +1,16 @@
-#include "hostdata.h"
-

 #include <cstring>
 #include <algorithm>
 #include <stdexcept>
 #include <xbt/log.h>
 #include <cstring>
 #include <algorithm>
 #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);
 

+#include "misc.h"
+#include "options.h"
+
+#include "hostdata.h"
+

 std::vector<hostdata> hostdata::hosts;
 
 // used to compare m_host_t's by name
 std::vector<hostdata> hostdata::hosts;
 
 // used to compare m_host_t's by name


@@ -24,18 +27,18 @@ void hostdata::create()
 {
     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());
+    // 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;
     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 %lu hosts.", (unsigned long)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());

     }
 }
 
     }
 }