X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fd74f90dda33660f18bc32b278060c48d93c585..eae159a7a056450dfec373f559f38ea0b942d158:/src/msg/environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index cabbc9dbe9..fca4a9f412 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
@@ -62,16 +62,16 @@ m_host_t MSG_get_host_by_name(const char *name)
  */
 void MSG_create_environment(const char *file)
 {
-  xbt_dict_cursor_t c;
-  smx_host_t h;
+  xbt_lib_cursor_t cursor;
+  void **data;
   char *name;
 
   SIMIX_create_environment(file);
-  SIMIX_init();
 
   /* Initialize MSG hosts */
-  xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
-    __MSG_host_create(h, NULL);
+  xbt_lib_foreach(host_lib, cursor, name, data) {
+	if(data[SIMIX_HOST_LEVEL])
+      __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL], NULL);
   }
   return;
 }
@@ -83,15 +83,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;
-       }
-#endif
+  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...");
+#endif
+  return;
 }