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

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 1a62573380..5bdf7aecf3 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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,8 +11,6 @@
 #include <lualib.h>
 #endif
 
-SG_BEGIN_DECL()
-
 /********************************* MSG **************************************/
 
 /** \ingroup msg_simulation
@@ -35,46 +31,3 @@ void MSG_create_environment(const char *file)
 {
   SIMIX_create_environment(file);
 }
-
-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);
-}
-
-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);
-  }
-}
-
-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);
-}
-
-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)
-    xbt_dynar_push(whereto, &host);
-}
-
-SG_END_DECL()