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

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index e7bd23f06d..9783390f54 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -8,10 +8,10 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
-#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/engine.hpp"
 
-#ifdef HAVE_LUA
+#if HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
@@ -38,7 +38,7 @@ void MSG_create_environment(const char *file)
   SIMIX_create_environment(file);
 }
 
-void MSG_post_create_environment(void) {
+void MSG_post_create_environment() {
   xbt_lib_cursor_t cursor;
   void **data;
   char *name;
@@ -50,30 +50,37 @@ void MSG_post_create_environment(void) {
   }
 }
 
-msg_as_t MSG_environment_get_routing_root() {
-  return simgrid::s4u::Engine::instance()->rootAs();
+msg_netzone_t MSG_environment_get_routing_root()
+{
+  return simgrid::s4u::Engine::instance()->netRoot();
+}
+
+const char* MSG_environment_as_get_name(msg_netzone_t netzone)
+{
+  return netzone->name();
 }
 
-const char *MSG_environment_as_get_name(msg_as_t as) {
-  return as->name();
+msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+{
+  return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
 }
 
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
-  return simgrid::s4u::Engine::instance()->asByNameOrNull(name);
+xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t netzone)
+{
+  return netzone->children();
 }
 
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
-  return as->children();
+const char* MSG_environment_as_get_property_value(msg_netzone_t netzone, const char* name)
+{
+  return netzone->property(name);
 }
 
-const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
+void MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* name, char* value)
 {
-  xbt_dict_t dict = (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
-  if (dict==NULL)
-    return NULL;
-  return (char*) xbt_dict_get_or_null(dict, name);
+  netzone->setProperty(name, value);
 }
 
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
-  return as->hosts();
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+{
+  return netzone->hosts();
 }