X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60706059686cb73a95966439b7cc696eae84873a..f542eb7dfaec061b7274b3bd08f8ec6eaee90953:/src/bindings/lua/simgrid_lua.c

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index fa3be797ab..019dc95178 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 )
@@ -62,7 +64,7 @@ static void stackDump(const char *msg, lua_State * L)
     }
     p += sprintf(p, "  ");      /* put a separator */
   }
-  INFO2("%s%s", msg, buff);
+  XBT_INFO("%s%s", msg, buff);
 }
 
 /** @brief ensures that a userdata on the stack is a task and returns the pointer inside the userdata */
@@ -110,6 +112,7 @@ static m_task_t checkTask(lua_State * L, int index)
  */
 static int Task_new(lua_State * L)
 {
+  XBT_DEBUG("Task new...");
   const char *name = luaL_checkstring(L, 1);
   int comp_size = luaL_checkint(L, 2);
   int msg_size = luaL_checkint(L, 3);
@@ -171,16 +174,16 @@ static int Task_send(lua_State * L)
   if (res != MSG_OK)
     switch (res) {
     case MSG_TIMEOUT:
-      ERROR0("MSG_task_send failed : Timeout");
+      XBT_ERROR("MSG_task_send failed : Timeout");
       break;
     case MSG_TRANSFER_FAILURE:
-      ERROR0("MSG_task_send failed : Transfer Failure");
+      XBT_ERROR("MSG_task_send failed : Transfer Failure");
       break;
     case MSG_HOST_FAILURE:
-      ERROR0("MSG_task_send failed : Host Failure ");
+      XBT_ERROR("MSG_task_send failed : Host Failure ");
       break;
     default:
-      ERROR0
+      XBT_ERROR
           ("MSG_task_send failed : Unexpected error , please report this bug");
       break;
     }
@@ -200,16 +203,16 @@ static int Task_recv(lua_State * L)
   if (res != MSG_OK)
     switch (res) {
     case MSG_TIMEOUT:
-      ERROR0("MSG_task_receive failed : Timeout");
+      XBT_ERROR("MSG_task_receive failed : Timeout");
       break;
     case MSG_TRANSFER_FAILURE:
-      ERROR0("MSG_task_receive failed : Transfer Failure");
+      XBT_ERROR("MSG_task_receive failed : Transfer Failure");
       break;
     case MSG_HOST_FAILURE:
-      ERROR0("MSG_task_receive failed : Host Failure ");
+      XBT_ERROR("MSG_task_receive failed : Host Failure ");
       break;
     default:
-      ERROR0
+      XBT_ERROR
           ("MSG_task_receive failed : Unexpected error , please report this bug");
       break;
     }
@@ -269,7 +272,7 @@ static m_host_t checkHost(lua_State * L, int index)
 static int Host_get_by_name(lua_State * L)
 {
   const char *name = luaL_checkstring(L, 1);
-  DEBUG0("Getting Host from name...");
+  XBT_DEBUG("Getting Host from name...");
   m_host_t msg_host = MSG_get_host_by_name(name);
   if (!msg_host) {
     luaL_error(L, "null Host : MSG_get_host_by_name failled");
@@ -383,7 +386,7 @@ static int gras_add_process_function(lua_State * L)
         xbt_realloc(process.argv, (process.argc) * sizeof(char *));
     process.argv[(process.argc) - 1] = xbt_strdup(arg);
 
-    DEBUG2("index = %f , arg = %s \n", lua_tonumber(L, -2),
+    XBT_DEBUG("index = %f , arg = %s \n", lua_tonumber(L, -2),
            lua_tostring(L, -1));
     lua_pop(L, 1);
   }
@@ -410,29 +413,34 @@ static int gras_generate(lua_State * L)
  **********************************/
 static int trace_start(lua_State *L)
 {
-	TRACE_start();
-	return 1;
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
+  return 1;
 }
 
 static int trace_category(lua_State * L)
 {
-	const char * category = luaL_checkstring(L, 1);
-	TRACE_category(category);
-	return 1;
+#ifdef HAVE_TRACING
+  TRACE_category(luaL_checkstring(L, 1));
+#endif
+  return 1;
 }
 
 static int trace_set_task_category(lua_State *L)
 {
-	m_task_t tk = checkTask(L, -2);
-	const char *category = luaL_checkstring(L, -1);
-	TRACE_msg_set_task_category(tk,category);
-	return 1;
+#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)
 {
-	TRACE_end();
-	return 1;
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+  return 1;
 }
 //***********Register Methods *******************************************//
 /*
@@ -446,7 +454,6 @@ static const luaL_reg Host_methods[] = {
   {"self",Host_self},
   {"getPropValue",Host_get_property_value},
   // Bypass XML Methods
-  {"new", console_add_host},
   {"setFunction", console_set_function},
   {0, 0}
 };
@@ -476,23 +483,9 @@ static const luaL_reg Host_meta[] = {
  */
 static const luaL_reg AS_methods[] = {
   {"new", console_add_AS},
-  {0, 0}
-};
-
-
-/*
- * Link Methods
- */
-static const luaL_reg Link_methods[] = {
-  {"new", console_add_link},
-  {0, 0}
-};
-
-/*
- * Route Methods
- */
-static const luaL_reg Route_methods[] = {
-  {"new", console_add_route},
+  {"addHost",console_add_host},
+  {"addLink",console_add_link},
+  {"addRoute",console_add_route},
   {0, 0}
 };
 
@@ -510,11 +503,11 @@ static const luaL_reg Trace_methods[] = {
  * Environment related
  */
 
-extern lua_State *simgrid_lua_state;
+//extern lua_State *simgrid_lua_state;
 
 static int run_lua_code(int argc, char **argv)
 {
-  DEBUG1("Run lua code %s", argv[0]);
+  XBT_DEBUG("Run lua code %s", argv[0]);
   lua_State *L = lua_newthread(simgrid_lua_state);
   int ref = luaL_ref(simgrid_lua_state, LUA_REGISTRYINDEX);     // protect the thread from being garbage collected
   int res = 1;
@@ -541,7 +534,7 @@ static int run_lua_code(int argc, char **argv)
   }
   // cleanups
   luaL_unref(simgrid_lua_state, LUA_REGISTRYINDEX, ref);
-  DEBUG1("Execution of lua code %s is over", (argv ? argv[0] : "(null)"));
+  XBT_DEBUG("Execution of lua code %s is over", (argv ? argv[0] : "(null)"));
   return res;
 }
 
@@ -557,13 +550,19 @@ static int launch_application(lua_State * L)
 static int create_environment(lua_State * L)
 {
   const char *file = luaL_checkstring(L, 1);
-  DEBUG1("Loading environment file %s", file);
+  XBT_DEBUG("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) {
+    XBT_DEBUG("We have an host %s", SIMIX_host_get_name(host));
   }
+*/
 
   return 0;
 }
@@ -571,14 +570,14 @@ static int create_environment(lua_State * L)
 static int debug(lua_State * L)
 {
   const char *str = luaL_checkstring(L, 1);
-  DEBUG1("%s", str);
+  XBT_DEBUG("%s", str);
   return 0;
 }
 
 static int info(lua_State * L)
 {
   const char *str = luaL_checkstring(L, 1);
-  INFO1("%s", str);
+  XBT_INFO("%s", str);
   return 0;
 }
 
@@ -605,6 +604,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;
 }
@@ -616,6 +617,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;
 }
@@ -627,6 +630,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;
 }
@@ -679,15 +684,12 @@ static const luaL_Reg simgrid_funcs[] = {
 /*                       module management functions                                 */
 /* ********************************************************************************* */
 
-extern const char *xbt_ctx_factory_to_use;      /*Hack: let msg load directly the right factory */
-
 #define LUA_MAX_ARGS_COUNT 10   /* maximum amount of arguments we can get from lua on command line */
 #define TEST
 int luaopen_simgrid(lua_State * L);     // Fuck gcc: we don't need that prototype
 int luaopen_simgrid(lua_State * L)
 {
-
-  //xbt_ctx_factory_to_use = "lua";
+  XBT_DEBUG("Luaopen_Simgrid *****");
   char **argv = malloc(sizeof(char *) * LUA_MAX_ARGS_COUNT);
   int argc = 1;
   argv[0] = (char *) "/usr/bin/lua";    /* Lie on the argv[0] so that the stack dumping facilities find the right binary. FIXME: what if lua is not in that location? */
@@ -712,14 +714,14 @@ int luaopen_simgrid(lua_State * L)
                     __FILE__, LUA_MAX_ARGS_COUNT - 1);
         argv[argc - 1] = (char *) luaL_checkstring(L, -1);
         lua_pop(L, 1);
-        DEBUG1("Got command line argument %s from lua", argv[argc - 1]);
+        XBT_DEBUG("Got command line argument %s from lua", argv[argc - 1]);
       }
     }
     argv[argc--] = NULL;
 
     /* Initialize the MSG core */
     MSG_global_init(&argc, argv);
-    DEBUG1("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+    XBT_DEBUG("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
   }
   /* register the core C functions to lua */
   luaL_register(L, "simgrid", simgrid_funcs);
@@ -752,15 +754,7 @@ int luaopen_simgrid(lua_State * L)
   luaL_newmetatable(L, AS_MODULE_NAME);
   lua_pop(L, 1);
 
-  /* register the links methods to lua */
-  luaL_openlib(L, LINK_MODULE_NAME, Link_methods, 0);
-  luaL_newmetatable(L, LINK_MODULE_NAME);
-  lua_pop(L, 1);
 
-  /*register the routes methods to lua */
-  luaL_openlib(L, ROUTE_MODULE_NAME, Route_methods, 0);
-  luaL_newmetatable(L, ROUTE_MODULE_NAME);
-  lua_pop(L, 1);
 
   /*register the Tracing functions to lua */
   luaL_openlib(L, TRACE_MODULE_NAME, Trace_methods, 0);