optimize performances

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index ebf3823..44999c9 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -8,7 +8,7 @@
 #include <functional>
 #include <stdexcept>
 
-#include <unordered_map>
+#include <map>
 
 #include "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
@@ -24,9 +24,8 @@
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_route);
 
-std::unordered_map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
+std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
 
-int MSG_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
 
 namespace simgrid {
@@ -40,6 +39,7 @@ namespace s4u {
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
 simgrid::xbt::signal<void(Host&)> Host::onDestruction;
 simgrid::xbt::signal<void(Host&)> Host::onStateChange;
+simgrid::xbt::signal<void(Host&)> Host::onSpeedChange;
 
 Host::Host(const char* name)
   : name_(name)
@@ -257,11 +257,9 @@ xbt_dict_t Host::mountedStoragesAsDict()
  * \brief Returns the list of storages attached to an host.
  * \return a dict containing all storages attached to the host
  */
-xbt_dynar_t Host::attachedStorages()
+void Host::attachedStorages(std::vector<const char*>* storages)
 {
-  return simgrid::simix::kernelImmediate([this] {
-    return this->pimpl_->getAttachedStorageList();
-  });
+  simgrid::simix::kernelImmediate([this, storages] { this->pimpl_->getAttachedStorageList(storages); });
 }
 
 } // namespace simgrid