X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c78a73b09f4c01d837cacfe249bd18a3ce95e02..806504b9602a886e391b54e458b2c1f7f42d3afb:/src/msg/environment.c diff --git a/src/msg/environment.c b/src/msg/environment.c index 0f7d6dce34..633995ff9e 100644 --- a/src/msg/environment.c +++ b/src/msg/environment.c @@ -36,12 +36,12 @@ m_host_t MSG_get_host_by_name(const char *name) { smx_host_t simix_h = NULL; - simix_h = SIMIX_host_get_by_name(name); - + simix_h = SIMIX_req_host_get_by_name(name); + if (simix_h == NULL) return NULL; - return (m_host_t)SIMIX_host_get_data(simix_h); + return (m_host_t) SIMIX_req_host_get_data(simix_h); } /** \ingroup msg_easier_life @@ -67,7 +67,6 @@ void MSG_create_environment(const char *file) char *name; SIMIX_create_environment(file); - SIMIX_init(); /* Initialize MSG hosts */ xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) { @@ -83,17 +82,19 @@ void MSG_create_environment(const char *file) * and the routing table */ -void MSG_load_platform_script(const char *script_file) { +void MSG_load_platform_script(const char *script_file) +{ #ifdef HAVE_LUA - lua_State *L = lua_open(); - luaL_openlibs(L); + 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; - } + 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!! to call MSG_load_platform_script, lua should be available..."); + xbt_die + ("Lua is not available!! to call MSG_load_platform_script, lua should be available..."); #endif - return; + return; }