Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add AS support in MSG and java bindings
[simgrid.git] / src / msg / msg_environment.c
index 0eb3952..78184f7 100644 (file)
@@ -45,30 +45,25 @@ void MSG_post_create_environment(void) {
   /* Initialize MSG hosts */
   xbt_lib_foreach(host_lib, cursor, name, data) {
     if(data[SIMIX_HOST_LEVEL])
-      __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL]);
+      __MSG_host_create(xbt_dict_cursor_get_elm(cursor));
   }
 }
 
-/**
- * @ingroup MSG_LUA
- * \brief A platform constructor bypassing the parser.
- *
- * load lua script file to set up new platform, including hosts,links
- * and the routing table
- */
+msg_as_t MSG_environment_get_routing_root() {
+  return surf_AS_get_routing_root();
+}
 
-void MSG_load_platform_script(const char *script_file)
-{
-#ifdef HAVE_LUA
-  lua_State *L = lua_open();
-  luaL_openlibs(L);
+const char *MSG_environment_as_get_name(msg_as_t as) {
+  return surf_AS_get_name(as);
+}
 
-  if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
-    printf("error: %s\n", lua_tostring(L, -1));
-    return;
-  }
-#else
-  xbt_die
-      ("Lua is not available! It is mandatory to use MSG_load_platform_script however. Bailing out...");
-#endif
+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;
+}
+
+const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
+{
+  xbt_dict_t dict = xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
+  return xbt_dict_get_or_null(dict, name);
 }