X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cf2cf4d9d0c0ba567528989c9d24624683ad64b..63ea61dcf159b166cad6f257cb92912971491470:/src/bindings/lua/simgrid_lua.c

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index e45013a9de..1f78abc781 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -9,6 +9,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
 
+lua_State *simgrid_lua_state;
+
 #define TASK_MODULE_NAME "simgrid.Task"
 #define HOST_MODULE_NAME "simgrid.Host"
 // Surf ( bypass XML )
@@ -410,25 +412,33 @@ static int gras_generate(lua_State * L)
  **********************************/
 static int trace_start(lua_State *L)
 {
+#ifdef HAVE_TRACING
   TRACE_start();
+#endif
   return 1;
 }
 
 static int trace_category(lua_State * L)
 {
+#ifdef HAVE_TRACING
   TRACE_category(luaL_checkstring(L, 1));
+#endif
   return 1;
 }
 
 static int trace_set_task_category(lua_State *L)
 {
+#ifdef HAVE_TRACING
   TRACE_msg_set_task_category(checkTask(L, -2), luaL_checkstring(L, -1));
+#endif
   return 1;
 }
 
 static int trace_end(lua_State *L)
 {
+#ifdef HAVE_TRACING
   TRACE_end();
+#endif
   return 1;
 }
 //***********Register Methods *******************************************//
@@ -556,11 +566,17 @@ static int create_environment(lua_State * L)
   const char *file = luaL_checkstring(L, 1);
   DEBUG1("Loading environment file %s", file);
   MSG_create_environment(file);
-  smx_host_t *hosts = SIMIX_host_get_table();
-  int i;
-  for (i = 0; i < SIMIX_host_get_number(); i++) {
-    DEBUG1("We have an host %s", SIMIX_host_get_name(hosts[i]));
+
+/*
+  xbt_dict_t hosts = SIMIX_host_get_dict();
+  smx_host_t host;
+  xbt_dict_cursor_t c;
+  const char *name;
+
+  xbt_dict_foreach(hosts, c, name, host) {
+    DEBUG1("We have an host %s", SIMIX_host_get_name(host));
   }
+*/
 
   return 0;
 }
@@ -602,6 +618,8 @@ static int msg_register_platform(lua_State * L)
 {
   /* Tell Simgrid we dont wanna use its parser */
   surf_parse = console_parse_platform;
+  surf_parse_reset_callbacks();
+  surf_config_models_setup(NULL);
   MSG_create_environment(NULL);
   return 0;
 }
@@ -613,6 +631,8 @@ static int msg_register_platform(lua_State * L)
 static int sd_register_platform(lua_State * L)
 {
   surf_parse = console_parse_platform_wsL07;
+  surf_parse_reset_callbacks();
+  surf_config_models_setup(NULL);
   SD_create_environment(NULL);
   return 0;
 }
@@ -624,6 +644,8 @@ static int gras_register_platform(lua_State * L)
 {
   /* Tell Simgrid we dont wanna use surf parser */
   surf_parse = console_parse_platform;
+  surf_parse_reset_callbacks();
+  surf_config_models_setup(NULL);
   gras_create_environment(NULL);
   return 0;
 }