moving dynar up in the stack

[simgrid.git] / src / simgrid / host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 2a364a7..51bc85e 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -14,11 +14,12 @@
 #include "src/kernel/routing/NetPoint.hpp"
 #include "src/simix/smx_host_private.h"
 #include "src/surf/HostImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
 // FIXME: The following duplicates the content of s4u::Host
-extern std::unordered_map<std::string, simgrid::s4u::Host*> host_list;
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
 
 extern "C" {
 
@@ -103,8 +104,6 @@ xbt_dynar_t sg_hosts_as_dynar()
 
 // ========= Layering madness ==============*
 
-#include "src/surf/cpu_interface.hpp"
-
 // ========== User data Layer ==========
 void *sg_host_user(sg_host_t host) {
   return host->extension(USER_HOST_LEVEL);
@@ -122,10 +121,12 @@ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
 }
 
 xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
-  return host->pimpl_->getAttachedStorageList();
+  xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
+  for (auto name : host->attachedStorages())
+    xbt_dynar_push(storage_dynar, &name);
+  return storage_dynar;
 }
 
-
 // =========== user-level functions ===============
 // ================================================
 /** @brief Returns the total speed of a host */