X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6dc62256f5ada58d6f50cfac38f10d97b2a03cc2..fb17c31966c617a068f0d69d3a419041150d905d:/src/bindings/lua/simgrid_lua.c diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index 9d878d57f0..3b60dc6080 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -12,30 +12,38 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings"); -static lua_State *lua_maestro_state; - #define TASK_MODULE_NAME "simgrid.Task" #define HOST_MODULE_NAME "simgrid.Host" // Surf (bypass XML) #define LINK_MODULE_NAME "simgrid.Link" #define ROUTE_MODULE_NAME "simgrid.Route" -#define AS_MODULE_NAME "simgrid.AS" -#define TRACE_MODULE_NAME "simgrid.Trace" +#define PLATF_MODULE_NAME "simgrid.platf" + +static lua_State* sglua_maestro_state; static void register_c_functions(lua_State *L); -static void *my_checkudata (lua_State *L, int ud, const char *tname) { +/** + * \brief Like luaL_checkudata, with additional debug logs. + * \param L a lua state + * \param ud index of the userdata to check in the stack + * \param tname key of the metatable of this userdata in the registry + */ +static void* my_checkudata(lua_State* L, int ud, const char* tname) { - XBT_DEBUG("Checking the task: ud = %d", ud); + XBT_DEBUG("Checking the userdata: ud = %d", ud); sglua_stack_dump("my_checkudata: ", L); - void *p = lua_touserdata(L, ud); + void* p = lua_touserdata(L, ud); lua_getfield(L, LUA_REGISTRYINDEX, tname); const void* correct_mt = lua_topointer(L, -1); int has_mt = lua_getmetatable(L, ud); - XBT_DEBUG("Checking the task: has metatable ? %d", has_mt); + XBT_DEBUG("Checking the userdata: has metatable ? %d", has_mt); const void* actual_mt = NULL; - if (has_mt) { actual_mt = lua_topointer(L, -1); lua_pop(L, 1); } + if (has_mt) { + actual_mt = lua_topointer(L, -1); + lua_pop(L, 1); + } XBT_DEBUG("Checking the task's metatable: expected %p, found %p", correct_mt, actual_mt); sglua_stack_dump("my_checkudata: ", L); @@ -46,28 +54,27 @@ static void *my_checkudata (lua_State *L, int ud, const char *tname) { } /** - * @brief Ensures that a userdata on the stack is a task - * and returns the pointer inside the userdata. + * @brief Ensures that a value is a valid task and returns it. * @param L a Lua state * @param index an index in the Lua stack * @return the task at this index */ -static m_task_t checkTask(lua_State * L, int index) +static m_task_t checkTask(lua_State* L, int index) { - m_task_t *pi, tk; - XBT_DEBUG("Lua task: %s", sglua_tostring(L, index)); + sglua_stack_dump("checkTask: ", L); luaL_checktype(L, index, LUA_TTABLE); + /* ... task ... */ lua_getfield(L, index, "__simgrid_task"); + /* ... task ... ctask */ + m_task_t task = *((m_task_t*) luaL_checkudata(L, -1, TASK_MODULE_NAME)); + lua_pop(L, 1); + /* ... task ... */ - pi = (m_task_t *) luaL_checkudata(L, lua_gettop(L), TASK_MODULE_NAME); + if (task == NULL) { + luaL_error(L, "This task was sent to someone else, you cannot access it anymore"); + } - if (pi == NULL) - luaL_typerror(L, index, TASK_MODULE_NAME); - tk = *pi; - if (!tk) - luaL_error(L, "null Task"); - lua_pop(L, 1); - return tk; + return task; } /* ********************************************************************************* */ @@ -75,91 +82,86 @@ static m_task_t checkTask(lua_State * L, int index) /* ********************************************************************************* */ /** - * A task is either something to compute somewhere, or something to exchange between two hosts (or both). - * It is defined by a computing amount and a message size. + * \brief Creates a new task and leaves it onto the stack. * + * Lua arguments: + * - task name (string) + * - computation size (integer) + * - communication size (integer) */ - -/* * * * - * * Constructors * * - * * * */ - -/** - * @brief Constructs a new task with the specified processing amount and amount - * of data needed. - * - * @param name Task's name - * - * @param computeDuration A value of the processing amount (in flop) needed to process the task. - * If 0, then it cannot be executed with the execute() method. - * This value has to be >= 0. - * - * @param messageSize A value of amount of data (in bytes) needed to transfert this task. - * If 0, then it cannot be transfered with the get() and put() methods. - * This value has to be >= 0. - */ -static int Task_new(lua_State * L) +static int Task_new(lua_State* L) { - XBT_DEBUG("Task new..."); - const char *name = luaL_checkstring(L, 1); + 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); + /* name comp comm */ + lua_settop(L, 0); + /* -- */ m_task_t msg_task = MSG_task_create(name, comp_size, msg_size, NULL); - lua_newtable(L); /* create a table, put the userdata on top of it */ - m_task_t *lua_task = (m_task_t *) lua_newuserdata(L, sizeof(m_task_t)); + + lua_newtable(L); + /* task */ + m_task_t* lua_task = (m_task_t*) lua_newuserdata(L, sizeof(m_task_t)); + /* task ctask */ *lua_task = msg_task; luaL_getmetatable(L, TASK_MODULE_NAME); + /* task ctask mt */ lua_setmetatable(L, -2); - lua_setfield(L, -2, "__simgrid_task"); /* put the userdata as field of the table */ - /* remove the args from the stack */ - lua_remove(L, 1); - lua_remove(L, 1); - lua_remove(L, 1); + /* task ctask */ + lua_setfield(L, -2, "__simgrid_task"); + /* task */ return 1; } -static int Task_get_name(lua_State * L) +static int Task_get_name(lua_State* L) { - m_task_t tk = checkTask(L, -1); - lua_pushstring(L, MSG_task_get_name(tk)); + m_task_t task = checkTask(L, 1); + lua_pushstring(L, MSG_task_get_name(task)); return 1; } -static int Task_computation_duration(lua_State * L) +static int Task_computation_duration(lua_State* L) { - m_task_t tk = checkTask(L, -1); - lua_pushnumber(L, MSG_task_get_compute_duration(tk)); - return 1; -} - -static int Task_execute(lua_State * L) -{ - m_task_t tk = checkTask(L, -1); - int res = MSG_task_execute(tk); - lua_pushnumber(L, res); + m_task_t task = checkTask(L, 1); + lua_pushnumber(L, MSG_task_get_compute_duration(task)); return 1; } -static int Task_destroy(lua_State * L) +static int Task_execute(lua_State* L) { - m_task_t tk = checkTask(L, -1); - int res = MSG_task_destroy(tk); + m_task_t task = checkTask(L, 1); + int res = MSG_task_execute(task); lua_pushnumber(L, res); return 1; } -static int Task_send(lua_State * L) +static int Task_send(lua_State* L) { - //stack_dump("send ", L); - m_task_t tk = checkTask(L, 1); - const char *mailbox = luaL_checkstring(L, 2); - lua_pop(L, 1); // remove the string so that the task is on top of it - MSG_task_set_data(tk, L); // Copy my stack into the task, so that the receiver can copy the lua task directly - MSG_error_t res = MSG_task_send(tk, mailbox); - while (MSG_task_get_data(tk) != NULL) // Don't mess up with my stack: the receiver didn't copy the data yet - MSG_process_sleep(0); // yield + m_task_t task = checkTask(L, 1); + const char* mailbox = luaL_checkstring(L, 2); + /* task mailbox */ + lua_settop(L, 1); + /* task */ + /* copy my stack into the task, so that the receiver can copy the lua task */ + MSG_task_set_data(task, L); + MSG_error_t res = MSG_task_send(task, mailbox); + while (MSG_task_get_data(task) != NULL) { + /* don't mess up with my stack: the receiver didn't copy the data yet */ + MSG_process_sleep(0); + } - if (res != MSG_OK) + if (res == MSG_OK) { + /* the receiver is the owner of the task and may destroy it: + * remove the C task on my side so that I don't garbage collect it */ + lua_getfield(L, 1, "__simgrid_task"); + /* task ctask */ + m_task_t* udata = (m_task_t*) luaL_checkudata(L, -1, TASK_MODULE_NAME); + *udata = NULL; + lua_pop(L, 1); + /* task */ + } + else { switch (res) { case MSG_TIMEOUT: XBT_DEBUG("MSG_task_send failed : Timeout"); @@ -175,20 +177,26 @@ static int Task_send(lua_State * L) ("MSG_task_send failed : Unexpected error , please report this bug"); break; } + } return 0; } static int Task_recv_with_timeout(lua_State *L) { - m_task_t tk = NULL; - const char *mailbox = luaL_checkstring(L, -2); - int timeout = luaL_checknumber(L, -1); - MSG_error_t res = MSG_task_receive_with_timeout(&tk, mailbox, timeout); + m_task_t task = NULL; + const char* mailbox = luaL_checkstring(L, 1); + int timeout = luaL_checknumber(L, 2); + /* mailbox timeout */ + lua_settop(L, 0); + /* -- */ + MSG_error_t res = MSG_task_receive_with_timeout(&task, mailbox, timeout); if (res == MSG_OK) { - lua_State *sender_stack = MSG_task_get_data(tk); - sglua_move_value(sender_stack, L); // copy the data directly from sender's stack - MSG_task_set_data(tk, NULL); + /* copy the data directly from sender's stack */ + lua_State* sender_stack = MSG_task_get_data(task); + sglua_copy_value(sender_stack, L); + /* task */ + MSG_task_set_data(task, NULL); } else { switch (res) { @@ -206,7 +214,9 @@ static int Task_recv_with_timeout(lua_State *L) break; } lua_pushnil(L); + /* nil */ } + /* task/nil */ return 1; } @@ -221,24 +231,27 @@ static const luaL_reg Task_methods[] = { {"name", Task_get_name}, {"computation_duration", Task_computation_duration}, {"execute", Task_execute}, - {"destroy", Task_destroy}, {"send", Task_send}, {"recv", Task_recv}, {"recv_timeout", Task_recv_with_timeout}, {NULL, NULL} }; -static int Task_gc(lua_State * L) +static int Task_gc(lua_State* L) { - m_task_t tk = checkTask(L, -1); - if (tk) - MSG_task_destroy(tk); + /* ctask */ + m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME)); + /* the task is NULL if I sent it to someone else */ + if (task != NULL) { + MSG_task_destroy(task); + } return 0; } -static int Task_tostring(lua_State * L) +static int Task_tostring(lua_State* L) { - lua_pushfstring(L, "Task :%p", lua_touserdata(L, 1)); + m_task_t task = checkTask(L, 1); + lua_pushfstring(L, "Task: %p", task); return 1; } @@ -421,40 +434,6 @@ static int gras_generate(lua_State * L) return 0; } -/*********************************** - * Tracing - **********************************/ -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 ******************************************* // @@ -499,23 +478,16 @@ static const luaL_reg Host_meta[] = { /* * AS Methods */ -static const luaL_reg AS_methods[] = { - {"new", console_add_AS}, - {"addHost", console_add_host}, - {"addLink", console_add_link}, - {"addRoute", console_add_route}, - {NULL, NULL} -}; - -/** - * Tracing Functions - */ -static const luaL_reg Trace_methods[] = { - {"start", trace_start}, - {"category", trace_category}, - {"setTaskCategory", trace_set_task_category}, - {"finish", trace_end}, - {NULL, NULL} +static const luaL_reg platf_methods[] = { + {"open", console_open}, + {"close", console_close}, + {"AS_open", console_AS_open}, + {"AS_close", console_AS_close}, + {"host_new", console_add_host}, + {"link_new", console_add_link}, + {"router_new", console_add_router}, + {"route_new", console_add_route}, + {NULL, NULL} }; /* @@ -546,7 +518,7 @@ static int run_lua_code(int argc, char **argv) lua_pushstring(L, argv[i]); /* call the function */ - int err; + _XBT_GNUC_UNUSED int err; err = lua_pcall(L, argc - 1, 1, 0); xbt_assert(err == 0, "error running function `%s': %s", argv[0], lua_tostring(L, -1)); @@ -614,7 +586,7 @@ static int clean(lua_State * L) static int msg_register_platform(lua_State * L) { /* Tell Simgrid we dont wanna use its parser */ - surf_parse = console_parse_platform; + //surf_parse = console_parse_platform; surf_parse_reset_callbacks(); MSG_create_environment(NULL); return 0; @@ -626,7 +598,7 @@ static int msg_register_platform(lua_State * L) static int sd_register_platform(lua_State * L) { - surf_parse = console_parse_platform_wsL07; + //surf_parse = console_parse_platform_wsL07; surf_parse_reset_callbacks(); SD_create_environment(NULL); return 0; @@ -637,8 +609,7 @@ static int sd_register_platform(lua_State * L) */ static int gras_register_platform(lua_State * L) { - /* Tell Simgrid we dont wanna use surf parser */ - surf_parse = console_parse_platform; + //surf_parse = console_parse_platform; surf_parse_reset_callbacks(); gras_create_environment(NULL); return 0; @@ -650,7 +621,7 @@ static int gras_register_platform(lua_State * L) static int msg_register_application(lua_State * L) { MSG_function_register_default(run_lua_code); - surf_parse = console_parse_application; + //surf_parse = console_parse_application; MSG_launch_application(NULL); return 0; } @@ -661,7 +632,7 @@ static int msg_register_application(lua_State * L) static int gras_register_application(lua_State * L) { gras_function_register_default(run_lua_code); - surf_parse = console_parse_application; + //surf_parse = console_parse_application; gras_launch_application(NULL); return 0; } @@ -741,7 +712,7 @@ int luaopen_simgrid(lua_State *L) } /* Keep the context mechanism informed of our lua world today */ - lua_maestro_state = L; + sglua_maestro_state = L; /* initialize access to my tables by children Lua states */ lua_newtable(L); @@ -758,7 +729,7 @@ int luaopen_simgrid(lua_State *L) * @return true if this is maestro */ int sglua_is_maestro(lua_State* L) { - return L == lua_maestro_state; + return L == sglua_maestro_state; } /** @@ -766,7 +737,7 @@ int sglua_is_maestro(lua_State* L) { * @return true the maestro Lua state */ lua_State* sglua_get_maestro(void) { - return lua_maestro_state; + return sglua_maestro_state; } /** @@ -803,12 +774,7 @@ void register_c_functions(lua_State *L) { lua_pop(L, 1); /* register the links methods to lua */ - luaL_openlib(L, AS_MODULE_NAME, AS_methods, 0); - luaL_newmetatable(L, AS_MODULE_NAME); - lua_pop(L, 1); - - /* register the Tracing functions to lua */ - luaL_openlib(L, TRACE_MODULE_NAME, Trace_methods, 0); - luaL_newmetatable(L, TRACE_MODULE_NAME); + luaL_openlib(L, PLATF_MODULE_NAME, platf_methods, 0); + luaL_newmetatable(L, PLATF_MODULE_NAME); lua_pop(L, 1); }