X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6636687a97c0b9be68be6b9b78fc070917fcf2a0..33bd120ba8c9d8906343ed3410bc77da4ba72b2a:/src/msg/msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 68c2a1c371..2b995a4ce3 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -3,9 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "src/msg/msg_private.h"
+#include "simgrid/msg.h"
 
 #if SIMGRID_HAVE_LUA
 #include <lua.h>
@@ -13,7 +11,7 @@
 #include <lualib.h>
 #endif
 
-SG_BEGIN_DECL()
+extern "C" {
 
 /********************************* MSG **************************************/
 
@@ -25,7 +23,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,61 +34,4 @@ 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();
-}
-
-const char* MSG_zone_get_name(msg_netzone_t netzone)
-{
-  return netzone->name();
-}
-
-msg_netzone_t MSG_zone_get_by_name(const char* name)
-{
-  return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
-}
-
-xbt_dict_t MSG_zone_get_sons(msg_netzone_t netzone)
-{
-  xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
-  for (auto elem : *netzone->children()) {
-    xbt_dict_set(res, elem->name(), static_cast<void*>(elem), nullptr);
-  }
-  return res;
 }
-
-const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name)
-{
-  return netzone->property(name);
-}
-
-void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
-{
-  netzone->setProperty(name, value);
-}
-
-xbt_dynar_t MSG_zone_get_hosts(msg_netzone_t netzone)
-{
-  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
-  for (auto host : *netzone->hosts()) {
-    xbt_dynar_push(res, &host);
-  }
-
-  return res;
-}
-
-SG_END_DECL()