Bug fix: credit can be negative.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 787b7ab926a3804c961c7ba3dd7c1a53e4b84671..5498ba8ad64127573f17748446880bbef4719e9e 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,5 +1,6 @@
-#include <cstring>

 #include <algorithm>
 #include <algorithm>

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

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


@@ -13,23 +14,26 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 std::vector<hostdata> hostdata::hosts;
 
 
 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()
 {
 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();

+#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)
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)

-        std::sort(host_list, host_list + nhosts, m_host_less());
+        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);
 
     hosts.assign(host_list, host_list + nhosts);
     xbt_free(host_list);