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

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index bd0ec18228..15f3b151c7 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,15 +1,11 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. 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 "xbt/sysdep.h"
-#include "xbt/log.h"
-
-#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/engine.hpp"
-#include "msg_private.hpp"
+#include "src/msg/msg_private.h"
 
 #if HAVE_LUA
 #include <lua.h>
@@ -50,31 +46,37 @@ void MSG_post_create_environment() {
   }
 }
 
-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_as_t as) {
-  return as->name();
+const char* MSG_environment_as_get_name(msg_netzone_t netzone)
+{
+  return netzone->name();
 }
 
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
-  return simgrid::s4u::Engine::instance()->asByNameOrNull(name);
+msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+{
+  return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
 }
 
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
-  return as->children();
+xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t netzone)
+{
+  return netzone->children();
 }
 
-const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
+const char* MSG_environment_as_get_property_value(msg_netzone_t netzone, const char* name)
 {
-  xbt_dict_t dict = static_cast<xbt_dict_t> (xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as),
-                                                                 ROUTING_PROP_ASR_LEVEL));
-  if (dict==nullptr)
-    return nullptr;
-  return static_cast<const char*>(xbt_dict_get_or_null(dict, name));
+  return netzone->property(name);
 }
 
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
-  return as->hosts();
+void MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* name, char* value)
+{
+  netzone->setProperty(name, value);
+}
+
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+{
+  return netzone->hosts();
 }