Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / msg / msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index d070253..2b19c76 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -8,7 +8,10 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
-#ifdef HAVE_LUA
+#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/engine.hpp"
+
+#if HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
@@ -48,20 +51,19 @@ void MSG_post_create_environment(void) {
 }
 
 msg_as_t MSG_environment_get_routing_root() {
-  return surf_AS_get_routing_root();
+  return simgrid::s4u::Engine::instance()->rootAs();
 }
 
 const char *MSG_environment_as_get_name(msg_as_t as) {
-  return surf_AS_get_name(as);
+  return as->name();
 }
 
 msg_as_t MSG_environment_as_get_by_name(const char * name) {
-  return surf_AS_get_by_name(name);
+  return simgrid::s4u::Engine::instance()->asByNameOrNull(name);
 }
 
 xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
-  xbt_dict_t res = surf_AS_get_routing_sons(as);
-  return res;
+  return as->children();
 }
 
 const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
@@ -73,5 +75,5 @@ const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
 }
 
 xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
-  return surf_AS_get_hosts(as);
+  return as->hosts();
 }