X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/164535529e5d19976ed96a2ee265d5945d27a660..b51e654b7a3eaee99205c5051de0bdccf8fe7632:/src/msg/msg_environment.c diff --git a/src/msg/msg_environment.c b/src/msg/msg_environment.c index c263080a62..497b254c37 100644 --- a/src/msg/msg_environment.c +++ b/src/msg/msg_environment.c @@ -7,7 +7,7 @@ #include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" -#include "xbt/dict.h" + #ifdef HAVE_LUA #include #include @@ -34,39 +34,17 @@ */ void MSG_create_environment(const char *file) { + SIMIX_create_environment(file); +} + +void MSG_post_create_environment(void) { xbt_lib_cursor_t cursor; void **data; char *name; - SIMIX_create_environment(file); - /* 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], NULL); - } -} - -/** - * @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 - */ - -void MSG_load_platform_script(const char *script_file) -{ -#ifdef HAVE_LUA - lua_State *L = lua_open(); - luaL_openlibs(L); - - if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) { - printf("error: %s\n", lua_tostring(L, -1)); - return; + __MSG_host_create(xbt_dict_cursor_get_elm(cursor)); } -#else - xbt_die - ("Lua is not available! It is mandatory to use MSG_load_platform_script however. Bailing out..."); -#endif }