Define simgrid::xbt::Path to manage file names.

[simgrid.git] / src / msg / msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 0dee03e..92d67e9 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -5,7 +5,7 @@
 
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
 
 #if SIMGRID_HAVE_LUA
 #include <lua.h>
@@ -13,7 +13,7 @@
 #include <lualib.h>
 #endif
 
-SG_BEGIN_DECL()
+extern "C" {
 
 /********************************* MSG **************************************/
 
@@ -25,7 +25,7 @@ SG_BEGIN_DECL()
  *
  *     \include simgrid.dtd
  *
- * Here is a small example of such a platform 
+ * Here is a small example of such a platform
  *
  *     \include small_platform.xml
  *
@@ -36,43 +36,31 @@ void MSG_create_environment(const char *file)
   SIMIX_create_environment(file);
 }
 
-void MSG_post_create_environment() {
-  xbt_lib_cursor_t cursor;
-  void **data;
-  char *name;
-
-  /* Initialize MSG storages */
-  xbt_lib_foreach(storage_lib, cursor, name, data) {
-    if(data[SIMIX_STORAGE_LEVEL])
-      __MSG_storage_create(xbt_dict_cursor_get_elm(cursor));
-  }
-}
-
 msg_netzone_t MSG_zone_get_root()
 {
-  return simgrid::s4u::Engine::instance()->netRoot();
+  return simgrid::s4u::Engine::getInstance()->getNetRoot();
 }
 
 const char* MSG_zone_get_name(msg_netzone_t netzone)
 {
-  return netzone->name();
+  return netzone->getCname();
 }
 
 msg_netzone_t MSG_zone_get_by_name(const char* name)
 {
-  return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
+  return simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(name);
 }
 
 void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
 {
-  for (auto elem : *netzone->children()) {
-    xbt_dict_set(whereto, elem->name(), static_cast<void*>(elem), nullptr);
+  for (auto const& elem : *netzone->getChildren()) {
+    xbt_dict_set(whereto, elem->getCname(), static_cast<void*>(elem), nullptr);
   }
 }
 
 const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name)
 {
-  return netzone->property(name);
+  return netzone->getProperty(name);
 }
 
 void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
@@ -82,10 +70,10 @@ void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char*
 
 void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
 {
+  /* converts vector to dynar */
   std::vector<simgrid::s4u::Host*> hosts;
-  netzone->hosts(&hosts);
-  for (auto host : hosts)
+  netzone->getHosts(&hosts);
+  for (auto const& host : hosts)
     xbt_dynar_push(whereto, &host);
 }
-
-SG_END_DECL()
+}