X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..047872771f0685df5ad0db3422b3333e26696330:/src/msg/msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 4392d98bee..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.hpp"
+#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 **************************************/
 
@@ -36,45 +34,4 @@ void MSG_create_environment(const char *file)
   SIMIX_create_environment(file);
 }
 
-msg_netzone_t MSG_zone_get_root()
-{
-  return simgrid::s4u::Engine::getInstance()->getNetRoot();
-}
-
-const char* MSG_zone_get_name(msg_netzone_t netzone)
-{
-  return netzone->getCname();
-}
-
-msg_netzone_t MSG_zone_get_by_name(const char* name)
-{
-  return simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(name);
-}
-
-void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
-{
-  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->getProperty(name);
-}
-
-void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
-{
-  netzone->setProperty(name, value);
-}
-
-void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
-{
-  /* converts vector to dynar */
-  std::vector<simgrid::s4u::Host*> hosts;
-  netzone->getHosts(&hosts);
-  for (auto const& host : hosts)
-    xbt_dynar_push(whereto, &host);
-}
-
-SG_END_DECL()