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 )
**********************************/
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 *******************************************//
/*
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;
}
{
/* 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;
}
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;
}
{
/* 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;
}
/* 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)
{
- //xbt_ctx_factory_to_use = "lua";
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? */