X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..2895b2413e1efc17e3a42047c85a4917f1114708:/src/bindings/lua/simgrid_lua.c diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c index 105ac869a6..e919383643 100644 --- a/src/bindings/lua/simgrid_lua.c +++ b/src/bindings/lua/simgrid_lua.c @@ -1,269 +1,349 @@ -/* SimGrid Lua bindings */ - /* Copyright (c) 2010. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include -#include "msg/msg.h" -#include "simdag/simdag.h" -#include -#include "xbt.h" -#include "lua_stub_generator.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings"); - -#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" - -/* ********************************************************************************* */ -/* helper functions */ -/* ********************************************************************************* */ -static void stackDump(const char *msg, lua_State * L) -{ - char buff[2048]; - char *p = buff; - int i; - int top = lua_gettop(L); - - fflush(stdout); - p += sprintf(p, "STACK(top=%d): ", top); +/* SimGrid Lua bindings */ - for (i = 1; i <= top; i++) { /* repeat for each level */ - int t = lua_type(L, i); - switch (t) { +#include "simgrid_lua.h" +#include "lua_state_cloner.h" +#include "lua_utils.h" - case LUA_TSTRING: /* strings */ - p += sprintf(p, "`%s'", lua_tostring(L, i)); - break; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings"); - case LUA_TBOOLEAN: /* booleans */ - p += sprintf(p, lua_toboolean(L, i) ? "true" : "false"); - break; +#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 PLATF_MODULE_NAME "simgrid.platf" - case LUA_TNUMBER: /* numbers */ - p += sprintf(p, "%g", lua_tonumber(L, i)); - break; +static lua_State* sglua_maestro_state; - case LUA_TTABLE: - p += sprintf(p, "Table"); - break; +int luaopen_simgrid(lua_State *L); +static void register_c_functions(lua_State *L); +static int run_lua_code(int argc, char **argv); - default: /* other values */ - p += sprintf(p, "???"); -/* if ((ptr = luaL_checkudata(L,i,TASK_MODULE_NAME))) { - p+=sprintf(p,"task"); - } else { - p+=printf(p,"%s", lua_typename(L, t)); - }*/ - break; - } - p += sprintf(p, " "); /* put a separator */ +/** + * \brief Like luaL_checkudata, with additional debug logs. + * + * This function is for debugging purposes only. + * + * \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 userdata: ud = %d", ud); + sglua_stack_dump("my_checkudata: ", L); + 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 userdata: has metatable ? %d", has_mt); + const void* actual_mt = NULL; + if (has_mt) { + actual_mt = lua_topointer(L, -1); + lua_pop(L, 1); } - INFO2("%s%s", msg, buff); -} + XBT_DEBUG("Checking the task's metatable: expected %p, found %p", correct_mt, actual_mt); + sglua_stack_dump("my_checkudata: ", L); -/** @brief ensures that a userdata on the stack is a task and returns the pointer inside the userdata */ -static m_task_t checkTask(lua_State * L, int index) -{ - m_task_t *pi, tk; - luaL_checktype(L, index, LUA_TTABLE); - lua_getfield(L, index, "__simgrid_task"); - pi = (m_task_t *) luaL_checkudata(L, -1, TASK_MODULE_NAME); - 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; + if (p == NULL || !lua_getmetatable(L, ud) || !lua_rawequal(L, -1, -2)) + luaL_typerror(L, ud, tname); + lua_pop(L, 2); + return p; } /* ********************************************************************************* */ -/* wrapper functions */ +/* simgrid.task API */ /* ********************************************************************************* */ /** - * 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 Ensures that a value in the stack is a valid task and returns it. + * \param L a Lua state + * \param index an index in the Lua stack + * \return the C task corresponding to this Lua task */ +static m_task_t sglua_checktask(lua_State* L, int index) +{ + sglua_stack_dump("check task: ", 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 ... */ + + if (task == NULL) { + luaL_error(L, "This task was sent to someone else, you cannot access it anymore"); + } + + return task; +} -/* * * * - * * Constructors * * - * * * */ /** - * Construct an 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. + * \brief Creates a new task and leaves it onto the stack. + * \param L a Lua state + * \return number of values returned to Lua * - * @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. + * - Argument 1 (string): name of the task + * - Argument 2 (number): computation size + * - Argument 3 (number): communication size + * - Return value (task): the task created */ -static int Task_new(lua_State * L) +static int l_task_new(lua_State* L) { - 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) +/** + * \brief Returns the name of a task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (task): a task + * - Return value (string): name of the task + */ +static int l_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 = sglua_checktask(L, 1); + lua_pushstring(L, MSG_task_get_name(task)); return 1; } -static int Task_computation_duration(lua_State * L) +/** + * \brief Returns the computation duration of a task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (task): a task + * - Return value (number): computation duration of this task + */ +static int l_task_computation_duration(lua_State* L) { - m_task_t tk = checkTask(L, -1); - lua_pushnumber(L, MSG_task_get_compute_duration(tk)); + m_task_t task = sglua_checktask(L, 1); + lua_pushnumber(L, MSG_task_get_compute_duration(task)); return 1; } -static int Task_execute(lua_State * L) +/** + * \brief Executes a task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (task): the task to execute + * - Return value (number): error code + */ +static int l_task_execute(lua_State* L) { - m_task_t tk = checkTask(L, -1); - int res = MSG_task_execute(tk); + m_task_t task = sglua_checktask(L, 1); + int res = MSG_task_execute(task); lua_pushnumber(L, res); return 1; } -static int Task_destroy(lua_State * L) -{ - m_task_t tk = checkTask(L, -1); - int res = MSG_task_destroy(tk); - lua_pushnumber(L, res); - return 1; -} +/** + * \brief Sends a task to a mailbox and waits for its completion. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (task): the task to send + * - Argument 2 (string): mailbox + */ +static int l_task_send(lua_State* L) +{ + m_task_t task = sglua_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); + } -static int Task_send(lua_State * L) -{ - //stackDump("send ",L); - m_task_t tk = checkTask(L, -2); - const char *mailbox = luaL_checkstring(L, -1); - 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 - - 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: - ERROR0("MSG_task_send failed : Timeout"); + XBT_DEBUG("MSG_task_send failed : Timeout"); break; case MSG_TRANSFER_FAILURE: - ERROR0("MSG_task_send failed : Transfer Failure"); + XBT_DEBUG("MSG_task_send failed : Transfer Failure"); break; case MSG_HOST_FAILURE: - ERROR0("MSG_task_send failed : Host Failure "); + XBT_DEBUG("MSG_task_send failed : Host Failure "); break; default: - ERROR0 + XBT_ERROR ("MSG_task_send failed : Unexpected error , please report this bug"); break; } + } return 0; } -static int Task_recv(lua_State * L) -{ - m_task_t tk = NULL; - const char *mailbox = luaL_checkstring(L, -1); - MSG_error_t res = MSG_task_receive(&tk, mailbox); - - lua_State *sender_stack = MSG_task_get_data(tk); - lua_xmove(sender_stack, L, 1); // copy the data directly from sender's stack - MSG_task_set_data(tk, NULL); - - if (res != MSG_OK) +/** + * \brief Receives a task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): mailbox + * - Argument 2 (number, optional): timeout (default is no timeout) + * - Return value (task/nil): the task received or nil if the communication + * has failed + */ +static int l_task_recv(lua_State *L) +{ + m_task_t task = NULL; + const char* mailbox = luaL_checkstring(L, 1); + int timeout; + if (lua_gettop(L) >= 2) { + /* mailbox timeout */ + timeout = luaL_checknumber(L, 2); + } + else { + /* mailbox */ + timeout = -1; + /* no timeout by default */ + } + lua_settop(L, 0); + /* -- */ + MSG_error_t res = MSG_task_receive_with_timeout(&task, mailbox, timeout); + + if (res == MSG_OK) { + /* 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) { case MSG_TIMEOUT: - ERROR0("MSG_task_receive failed : Timeout"); + XBT_DEBUG("MSG_task_receive failed : Timeout"); break; case MSG_TRANSFER_FAILURE: - ERROR0("MSG_task_receive failed : Transfer Failure"); + XBT_DEBUG("MSG_task_receive failed : Transfer Failure"); break; case MSG_HOST_FAILURE: - ERROR0("MSG_task_receive failed : Host Failure "); + XBT_DEBUG("MSG_task_receive failed : Host Failure "); break; default: - ERROR0 - ("MSG_task_receive failed : Unexpected error , please report this bug"); + XBT_ERROR("MSG_task_receive failed : Unexpected error , please report this bug"); break; } - + lua_pushnil(L); + /* nil */ + } + /* task/nil */ return 1; } -static const luaL_reg Task_methods[] = { - {"new", Task_new}, - {"name", Task_get_name}, - {"computation_duration", Task_computation_duration}, - {"execute", Task_execute}, - {"destroy", Task_destroy}, - {"send", Task_send}, - {"recv", Task_recv}, - {0, 0} +static const luaL_reg task_functions[] = { + {"new", l_task_new}, + {"name", l_task_get_name}, + {"computation_duration", l_task_computation_duration}, + {"execute", l_task_execute}, + {"send", l_task_send}, + {"recv", l_task_recv}, + {NULL, NULL} }; -static int Task_gc(lua_State * L) +/** + * \brief Finalizes the userdata of a task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (userdata): a C task, possibly NULL if it was sent to another + * Lua state + */ +static int l_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) +/** + * \brief Returns a string representation of a C task. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (userdata): a task + * - Return value (string): a string describing this task + */ +static int l_task_tostring(lua_State* L) { - lua_pushfstring(L, "Task :%p", lua_touserdata(L, 1)); + m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME)); + lua_pushfstring(L, "Task: %p", task); return 1; } -static const luaL_reg Task_meta[] = { - {"__gc", Task_gc}, - {"__tostring", Task_tostring}, - {0, 0} +static const luaL_reg task_meta[] = { + {"__gc", l_task_gc}, + {"__tostring", l_task_tostring}, + {NULL, NULL} }; +/* ********************************************************************************* */ +/* simgrid.host API */ +/* ********************************************************************************* */ + /** - * Host + * \brief Ensures that a value in the stack is a host and returns it. + * \param L a Lua state + * \param index an index in the Lua stack + * \return the C host corresponding to this Lua host */ -static m_host_t checkHost(lua_State * L, int index) +static m_host_t sglua_checkhost(lua_State * L, int index) { m_host_t *pi, ht; luaL_checktype(L, index, LUA_TTABLE); lua_getfield(L, index, "__simgrid_host"); - pi = (m_host_t *) luaL_checkudata(L, -1, HOST_MODULE_NAME); + pi = (m_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME); if (pi == NULL) luaL_typerror(L, index, HOST_MODULE_NAME); ht = *pi; @@ -273,13 +353,21 @@ static m_host_t checkHost(lua_State * L, int index) return ht; } -static int Host_get_by_name(lua_State * L) +/** + * \brief Returns a host given its name. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): name of a host + * - Return value (host): the corresponding host + */ +static int l_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"); + luaL_error(L, "null Host : MSG_get_host_by_name failed"); } lua_newtable(L); /* create a table, put the userdata on top of it */ m_host_t *lua_host = (m_host_t *) lua_newuserdata(L, sizeof(m_host_t)); @@ -292,21 +380,43 @@ static int Host_get_by_name(lua_State * L) return 1; } - -static int Host_get_name(lua_State * L) +/** + * \brief Returns the name of a host. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (host): a host + * - Return value (string): name of this host + */ +static int l_host_get_name(lua_State * L) { - m_host_t ht = checkHost(L, -1); + m_host_t ht = sglua_checkhost(L, 1); lua_pushstring(L, MSG_host_get_name(ht)); return 1; } -static int Host_number(lua_State * L) +/** + * \brief Returns the number of existing hosts. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Return value (number): number of hosts + */ +static int l_host_number(lua_State * L) { lua_pushnumber(L, MSG_get_host_number()); return 1; } -static int Host_at(lua_State * L) +/** + * \brief Returns the host given its index. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (number): an index (1 is the first) + * - Return value (host): the host at this index + */ +static int l_host_at(lua_State * L) { int index = luaL_checkinteger(L, 1); m_host_t host = MSG_get_host_table()[index - 1]; // lua indexing start by 1 (lua[1] <=> C[0]) @@ -317,592 +427,115 @@ static int Host_at(lua_State * L) lua_setmetatable(L, -2); lua_setfield(L, -2, "__simgrid_host"); /* put the userdata as field of the table */ return 1; - -} - -/***************************************************************************************** - * BYPASS XML SURF Methods * - *************************** - *************************** -******************************************************************************************/ -#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ -#include "surf/surf_private.h" - -typedef struct t_AS_attr { - const char *id; - const char *mode; -} AS_attr, *p_AS_attr; - -typedef struct t_host_attr { - //platform attribute - // Mandatory attributes - const char *id; - double power_peak; - // Optional attributes - double power_scale; - const char *power_trace; - int state_initial; - const char *state_trace; - //deployment attribute - const char *function; - xbt_dynar_t args_list; -} host_attr, *p_host_attr; - -typedef struct t_link_attr { - //mandatory attributes - const char *id; - double bandwidth; - double latency; - // Optional attributes - const char *bandwidth_trace; - const char *latency_trace; - const char *state_trace; - int state_initial; - int policy; -} link_attr, *p_link_attr; - -typedef struct t_route_attr { - const char *src_id; - const char *dest_id; - xbt_dynar_t links_id; - -} route_attr, *p_route_attr; - -//AS : One struct needed -static p_AS_attr AS; - -//using xbt_dynar_t : -static xbt_dynar_t host_list_d; -static xbt_dynar_t link_list_d; -static xbt_dynar_t route_list_d; - - -/* - * Initialize platform model routing - */ -static void create_AS(const char *id, const char *mode) -{ - surf_AS_new(id, mode); -} - -/** - * create host resource via CPU model [for MSG] - */ - -static void create_host(const char *id, double power_peak, double power_sc, - const char *power_tr, int state_init, - const char *state_tr) -{ - - double power_scale = 1.0; - tmgr_trace_t power_trace = NULL; - e_surf_resource_state_t state_initial; - tmgr_trace_t state_trace; - if (power_sc) // !=0 - power_scale = power_sc; - if (state_init == -1) - state_initial = SURF_RESOURCE_OFF; - else - state_initial = SURF_RESOURCE_ON; - if (power_tr) - power_trace = tmgr_trace_new(power_tr); - else - power_trace = tmgr_trace_new(""); - if (state_tr) - state_trace = tmgr_trace_new(state_tr); - else - state_trace = tmgr_trace_new(""); - current_property_set = xbt_dict_new(); - surf_host_create_resource(xbt_strdup(id), power_peak, power_scale, - power_trace, state_initial, state_trace, - current_property_set); - -} - -/** - * create link resource via network model - */ -static void create_link(const char *name, - double bw_initial, const char *trace, - double lat_initial, const char *latency_trace, - int state_init, const char *state_trace, - int policy) -{ - tmgr_trace_t bw_trace; - tmgr_trace_t lat_trace; - e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON; - e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; - tmgr_trace_t st_trace; - if (trace) - bw_trace = tmgr_trace_new(trace); - else - bw_trace = tmgr_trace_new(""); - - if (latency_trace) - lat_trace = tmgr_trace_new(latency_trace); - else - lat_trace = tmgr_trace_new(""); - - if (state_trace) - st_trace = tmgr_trace_new(state_trace); - else - st_trace = tmgr_trace_new(""); - - if (state_init == -1) - state_initial_link = SURF_RESOURCE_OFF; - if (policy == -1) - policy_initial_link = SURF_LINK_FATPIPE; - - surf_link_create_resource(xbt_strdup(name), bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, - st_trace, policy_initial_link, xbt_dict_new()); -} - - -/* - *create host resource via workstation_ptask_L07 model [for SimDag] - */ -static void create_host_wsL07(const char *id, double power_peak, - double power_sc, const char *power_tr, - int state_init, const char *state_tr) -{ - double power_scale = 1.0; - tmgr_trace_t power_trace = NULL; - e_surf_resource_state_t state_initial; - tmgr_trace_t state_trace; - if (power_sc) // !=0 - power_scale = power_sc; - if (state_init == -1) - state_initial = SURF_RESOURCE_OFF; - else - state_initial = SURF_RESOURCE_ON; - if (power_tr) - power_trace = tmgr_trace_new(power_tr); - else - power_trace = tmgr_trace_new(""); - if (state_tr) - state_trace = tmgr_trace_new(state_tr); - else - state_trace = tmgr_trace_new(""); - current_property_set = xbt_dict_new(); - surf_wsL07_host_create_resource(xbt_strdup(id), power_peak, power_scale, - power_trace, state_initial, state_trace, - current_property_set); - } /** - * create link resource via workstation_ptask_L07 model [for SimDag] - */ - -static void create_link_wsL07(const char *name, - double bw_initial, const char *trace, - double lat_initial, - const char *latency_trace, int state_init, - const char *state_trace, int policy) -{ - tmgr_trace_t bw_trace; - tmgr_trace_t lat_trace; - e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON; - e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; - tmgr_trace_t st_trace; - if (trace) - bw_trace = tmgr_trace_new(trace); - else - bw_trace = tmgr_trace_new(""); - - if (latency_trace) - lat_trace = tmgr_trace_new(latency_trace); - else - lat_trace = tmgr_trace_new(""); - - if (state_trace) - st_trace = tmgr_trace_new(state_trace); - else - st_trace = tmgr_trace_new(""); - - if (state_init == -1) - state_initial_link = SURF_RESOURCE_OFF; - if (policy == -1) - policy_initial_link = SURF_LINK_FATPIPE; - - surf_wsL07_link_create_resource(xbt_strdup(name), bw_initial, bw_trace, - lat_initial, lat_trace, - state_initial_link, st_trace, - policy_initial_link, xbt_dict_new()); -} - - -/* - * init AS - */ - -static int AS_new(lua_State * L) -{ - const char *id; - const char *mode; - if (lua_istable(L, 1)) { - lua_pushstring(L, "id"); - lua_gettable(L, -2); - id = lua_tostring(L, -1); - lua_pop(L, 1); - - lua_pushstring(L, "mode"); - lua_gettable(L, -2); - mode = lua_tostring(L, -1); - lua_pop(L, 1); - } else { - ERROR0 - ("Bad Arguments to AS.new, Should be a table with named arguments"); - return -1; - } - AS = malloc(sizeof(AS_attr)); - AS->id = id; - AS->mode = mode; - - return 0; -} - -/* - * add new host to platform hosts list + * \brief Returns the host where the current process is located. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Return value (host): the current host */ -static int Host_new(lua_State * L) -{ - - if (xbt_dynar_is_empty(host_list_d)) - host_list_d = xbt_dynar_new(sizeof(p_host_attr), &xbt_free_ref); - - p_host_attr host; - const char *id; - const char *power_trace; - const char *state_trace; - double power, power_scale; - int state_initial; - //get values from the table passed as argument - if (lua_istable(L, -1)) { - - // get Id Value - lua_pushstring(L, "id"); - lua_gettable(L, -2); - id = lua_tostring(L, -1); - lua_pop(L, 1); - - // get power value - lua_pushstring(L, "power"); - lua_gettable(L, -2); - power = lua_tonumber(L, -1); - lua_pop(L, 1); - - //get power_scale - lua_pushstring(L, "power_scale"); - lua_gettable(L, -2); - power_scale = lua_tonumber(L, -1); - lua_pop(L, 1); - - //get power_trace - lua_pushstring(L, "power_trace"); - lua_gettable(L, -2); - power_trace = lua_tostring(L, -1); - lua_pop(L, 1); - - //get state initial - lua_pushstring(L, "state_initial"); - lua_gettable(L, -2); - state_initial = lua_tonumber(L, -1); - lua_pop(L, 1); - - //get trace state - lua_pushstring(L, "state_trace"); - lua_gettable(L, -2); - state_trace = lua_tostring(L, -1); - lua_pop(L, 1); - - } else { - ERROR0 - ("Bad Arguments to create host, Should be a table with named arguments"); - return -1; - } - - host = malloc(sizeof(host_attr)); - host->id = id; - host->power_peak = power; - host->power_scale = power_scale; - host->power_trace = power_trace; - host->state_initial = state_initial; - host->state_trace = state_trace; - host->function = NULL; - xbt_dynar_push(host_list_d, &host); - - return 0; +static int l_host_self(lua_State * L) +{ + /* -- */ + m_host_t host = MSG_host_self(); + lua_newtable(L); + /* table */ + m_host_t* lua_host = (m_host_t*) lua_newuserdata(L, sizeof(m_host_t)); + /* table ud */ + *lua_host = host; + luaL_getmetatable(L, HOST_MODULE_NAME); + /* table ud mt */ + lua_setmetatable(L, -2); + /* table ud */ + lua_setfield(L, -2, "__simgrid_host"); + /* table */ + return 1; } /** - * add link to platform links list + * \brief Returns the value of a host property. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (host): a host + * - Argument 2 (string): name of the property to get + * - Return value (string): the value of this property */ -static int Link_new(lua_State * L) // (id,bandwidth,latency) +static int l_host_get_property_value(lua_State * L) { - if (xbt_dynar_is_empty(link_list_d)) - link_list_d = xbt_dynar_new(sizeof(p_link_attr), &xbt_free_ref); - - const char *id; - double bandwidth, latency; - const char *bandwidth_trace; - const char *latency_trace; - const char *state_trace; - int state_initial, policy; - - //get values from the table passed as argument - if (lua_istable(L, -1)) { - // get Id Value - lua_pushstring(L, "id"); - lua_gettable(L, -2); - id = lua_tostring(L, -1); - lua_pop(L, 1); - - // get bandwidth value - lua_pushstring(L, "bandwidth"); - lua_gettable(L, -2); - bandwidth = lua_tonumber(L, -1); - lua_pop(L, 1); - - //get latency value - lua_pushstring(L, "latency"); - lua_gettable(L, -2); - latency = lua_tonumber(L, -1); - lua_pop(L, 1); - - /*Optional Arguments */ - - //get bandwidth_trace value - lua_pushstring(L, "bandwidth_trace"); - lua_gettable(L, -2); - bandwidth_trace = lua_tostring(L, -1); - lua_pop(L, 1); - - //get latency_trace value - lua_pushstring(L, "latency_trace"); - lua_gettable(L, -2); - latency_trace = lua_tostring(L, -1); - lua_pop(L, 1); - - //get state_trace value - lua_pushstring(L, "state_trace"); - lua_gettable(L, -2); - state_trace = lua_tostring(L, -1); - lua_pop(L, 1); - - //get state_initial value - lua_pushstring(L, "state_initial"); - lua_gettable(L, -2); - state_initial = lua_tonumber(L, -1); - lua_pop(L, 1); - - - //get policy value - lua_pushstring(L, "policy"); - lua_gettable(L, -2); - policy = lua_tonumber(L, -1); - lua_pop(L, 1); - - } else { - ERROR0 - ("Bad Arguments to create link, Should be a table with named arguments"); - return -1; - } - - p_link_attr link = malloc(sizeof(link_attr)); - link->id = id; - link->bandwidth = bandwidth; - link->latency = latency; - link->bandwidth_trace = bandwidth_trace; - link->latency_trace = latency_trace; - link->state_trace = state_trace; - link->state_initial = state_initial; - link->policy = policy; - xbt_dynar_push(link_list_d, &link); - return 0; + m_host_t ht = sglua_checkhost(L, 1); + const char *prop = luaL_checkstring(L, 2); + lua_pushstring(L,MSG_host_get_property_value(ht,prop)); + return 1; } /** - * add route to platform routes list + * \brief Makes the current process sleep for a while. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (number): duration of the sleep */ -static int Route_new(lua_State * L) // (src_id,dest_id,links_number,link_table) +static int l_host_sleep(lua_State *L) { - if (xbt_dynar_is_empty(route_list_d)) - route_list_d = xbt_dynar_new(sizeof(p_route_attr), &xbt_free_ref); - const char *link_id; - p_route_attr route = malloc(sizeof(route_attr)); - route->src_id = luaL_checkstring(L, 1); - route->dest_id = luaL_checkstring(L, 2); - route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - lua_pushnil(L); - while (lua_next(L, 3) != 0) { - link_id = lua_tostring(L, -1); - xbt_dynar_push(route->links_id, &link_id); - DEBUG2("index = %f , Link_id = %s \n", lua_tonumber(L, -2), - lua_tostring(L, -1)); - lua_pop(L, 1); - } - lua_pop(L, 1); - - //add route to platform's route list - xbt_dynar_push(route_list_d, &route); - return 0; + int time = luaL_checknumber(L, 1); + MSG_process_sleep(time); + return 1; } /** - * set function to process + * \brief Destroys a host. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (host): the host to destroy */ -static int Host_set_function(lua_State * L) //(host,function,nb_args,list_args) +static int l_host_destroy(lua_State *L) { - // look for the index of host in host_list - const char *host_id = luaL_checkstring(L, 1); - const char *argument; - unsigned int i; - p_host_attr p_host; - - xbt_dynar_foreach(host_list_d, i, p_host) { - if (p_host->id == host_id) { - p_host->function = luaL_checkstring(L, 2); - if (lua_istable(L, 3)) { - p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - // fill the args list - lua_pushnil(L); - int j = 0; - while (lua_next(L, 3) != 0) { - argument = lua_tostring(L, -1); - xbt_dynar_push(p_host->args_list, &argument); - DEBUG2("index = %f , Arg_id = %s \n", lua_tonumber(L, -2), - lua_tostring(L, -1)); - j++; - lua_pop(L, 1); - } - } - lua_pop(L, 1); - return 0; - } - } - ERROR1("Host : %s Not Found !!", host_id); + m_host_t ht = sglua_checkhost(L, 1); + __MSG_host_destroy(ht); return 1; } -/* - * surf parse bypass platform - * through CPU/network Models - */ - -static int surf_parse_bypass_platform() -{ - unsigned int i; - p_host_attr p_host; - p_link_attr p_link; - p_route_attr p_route; - - // Init routing mode - create_AS(AS->id, AS->mode); - - - // Add Hosts - xbt_dynar_foreach(host_list_d, i, p_host) { - create_host(p_host->id, p_host->power_peak, p_host->power_scale, - p_host->power_trace, p_host->state_initial, - p_host->state_trace); - //add to routing model host list - surf_route_add_host((char *) p_host->id); - - } - - //add Links - xbt_dynar_foreach(link_list_d, i, p_link) { - create_link(p_link->id, p_link->bandwidth, p_link->bandwidth_trace, - p_link->latency, p_link->latency_trace, - p_link->state_initial, p_link->state_trace, - p_link->policy); - } - // add route - xbt_dynar_foreach(route_list_d, i, p_route) { - surf_routing_add_route((char *) p_route->src_id, - (char *) p_route->dest_id, p_route->links_id); - } - /* */ - - // Finalize AS - surf_AS_finalize(AS->id); - - // add traces - surf_add_host_traces(); - surf_add_link_traces(); - - return 0; // must return 0 ?!! - -} +static const luaL_reg host_functions[] = { + {"get_by_name", l_host_get_by_name}, + {"name", l_host_get_name}, + {"number", l_host_number}, + {"at", l_host_at}, + {"self", l_host_self}, + {"get_prop_value", l_host_get_property_value}, + {"sleep", l_host_sleep}, + {"destroy", l_host_destroy}, + // Bypass XML Methods + {"set_function", console_set_function}, + {"set_property", console_host_set_property}, + {NULL, NULL} +}; /** + * \brief Returns a string representation of a host. + * \param L a Lua state + * \return number of values returned to Lua * - * surf parse bypass platform - * through workstation_ptask_L07 Model + * - Argument 1 (userdata): a host + * - Return value (string): a string describing this host */ - - -static int surf_wsL07_parse_bypass_platform() +static int l_host_tostring(lua_State * L) { - unsigned int i; - p_host_attr p_host; - p_link_attr p_link; - p_route_attr p_route; - - // Init routing mode - create_AS(AS->id, AS->mode); - - // Add Hosts - xbt_dynar_foreach(host_list_d, i, p_host) { - create_host_wsL07(p_host->id, p_host->power_peak, p_host->power_scale, - p_host->power_trace, p_host->state_initial, - p_host->state_trace); - //add to routing model host list - surf_route_add_host((char *) p_host->id); - } - - //add Links - xbt_dynar_foreach(link_list_d, i, p_link) { - create_link_wsL07(p_link->id, p_link->bandwidth, - p_link->bandwidth_trace, p_link->latency, - p_link->latency_trace, p_link->state_initial, - p_link->state_trace, p_link->policy); - } - // add route - xbt_dynar_foreach(route_list_d, i, p_route) { - surf_routing_add_route((char *) p_route->src_id, - (char *) p_route->dest_id, p_route->links_id); - } - /* */ - - // Finalize AS - surf_AS_finalize(AS->id); - // add traces - surf_wsL07_add_traces(); - - return 0; -} - -/* - * surf parse bypass application for MSG Module - */ -static int surf_parse_bypass_application() -{ - unsigned int i; - p_host_attr p_host; - xbt_dynar_foreach(host_list_d, i, p_host) { - if (p_host->function) - MSG_set_function(p_host->id, p_host->function, p_host->args_list); - } - return 0; + lua_pushfstring(L, "Host :%p", lua_touserdata(L, 1)); + return 1; } +static const luaL_reg host_meta[] = { + {"__tostring", l_host_tostring}, + {0, 0} +}; -/** - * Generate Gras Templates File from lua - */ +/* ********************************************************************************* */ +/* lua_stub_generator functions */ +/* ********************************************************************************* */ xbt_dict_t process_function_set; xbt_dynar_t process_list; @@ -949,128 +582,52 @@ 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); } lua_pop(L, 1); //add to the process list xbt_dynar_push(process_list, &process); - return 0; - } - static int gras_generate(lua_State * L) { const char *project_name = luaL_checkstring(L, 1); generate_sim(project_name); generate_rl(project_name); generate_makefile_local(project_name); - - return 0; -} - -//***********Register Methods *******************************************// -/* - * Host Methods - */ -static const luaL_reg Host_methods[] = { - {"getByName", Host_get_by_name}, - {"name", Host_get_name}, - {"number", Host_number}, - {"at", Host_at}, - // Bypass XML Methods - {"new", Host_new}, - {"setFunction", Host_set_function}, - {0, 0} -}; - -static int Host_gc(lua_State * L) -{ - m_host_t ht = checkHost(L, -1); - if (ht) - ht = NULL; return 0; } -static int Host_tostring(lua_State * L) -{ - lua_pushfstring(L, "Host :%p", lua_touserdata(L, 1)); - return 1; -} - -static const luaL_reg Host_meta[] = { - {"__gc", Host_gc}, - {"__tostring", Host_tostring}, - {0, 0} -}; - -/* - * AS Methods - */ -static const luaL_reg AS_methods[] = { - {"new", AS_new}, - {0, 0} -}; - +/* ********************************************************************************* */ +/* simgrid.platf API */ +/* ********************************************************************************* */ -/* - * Link Methods - */ -static const luaL_reg Link_methods[] = { - {"new", Link_new}, - {0, 0} +static const luaL_reg platf_functions[] = { + {"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} }; -/* - * Route Methods - */ -static const luaL_reg Route_methods[] = { - {"new", Route_new}, - {0, 0} -}; +/* ********************************************************************************* */ +/* simgrid API */ +/* ********************************************************************************* */ -/* - * Environment related +/** + * \brief Deploys your application. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): name of the deployment file to load */ - -extern lua_State *simgrid_lua_state; - -static int run_lua_code(int argc, char **argv) -{ - DEBUG1("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; - - /* Start the co-routine */ - lua_getglobal(L, argv[0]); - xbt_assert1(lua_isfunction(L, -1), - "The lua function %s does not seem to exist", argv[0]); - - // push arguments onto the stack - int i; - for (i = 1; i < argc; i++) - lua_pushstring(L, argv[i]); - - // Call the function (in resume) - xbt_assert2(lua_pcall(L, argc - 1, 1, 0) == 0, - "error running function `%s': %s", argv[0], lua_tostring(L, - -1)); - - /* retrieve result */ - if (lua_isnumber(L, -1)) { - res = lua_tonumber(L, -1); - lua_pop(L, 1); /* pop returned value */ - } - // cleanups - luaL_unref(simgrid_lua_state, LUA_REGISTRYINDEX, ref); - DEBUG1("Execution of lua code %s is over", (argv ? argv[0] : "(null)")); - return res; -} - static int launch_application(lua_State * L) { const char *file = luaL_checkstring(L, 1); @@ -1079,58 +636,79 @@ static int launch_application(lua_State * L) return 0; } -#include "simix/simix.h" //FIXME: KILLME when debugging on simix internals become useless +/** + * \brief Creates the platform. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): name of the platform file to load + */ 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])); - } - return 0; } +/** + * \brief Prints a log string with debug level. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): the text to print + */ static int debug(lua_State * L) { const char *str = luaL_checkstring(L, 1); - DEBUG1("%s", str); + XBT_DEBUG("%s", str); return 0; } +/** + * \brief Prints a log string with info level. + * \param L a Lua state + * \return number of values returned to Lua + * + * - Argument 1 (string): the text to print + */ static int info(lua_State * L) { const char *str = luaL_checkstring(L, 1); - INFO1("%s", str); + XBT_INFO("%s", str); return 0; } +/** + * \brief Runs your application. + * \param L a Lua state + * \return number of values returned to Lua + */ static int run(lua_State * L) { MSG_main(); return 0; } +/** + * \brief Cleans the simulation. + * \param L a Lua state + * \return number of values returned to Lua + */ static int clean(lua_State * L) { MSG_clean(); return 0; } -/* - * Bypass XML Parser - */ - /* * Register platform for MSG */ static int msg_register_platform(lua_State * L) { /* Tell Simgrid we dont wanna use its parser */ - surf_parse = surf_parse_bypass_platform; + //surf_parse = console_parse_platform; + surf_parse_reset_callbacks(); MSG_create_environment(NULL); return 0; } @@ -1141,7 +719,8 @@ static int msg_register_platform(lua_State * L) static int sd_register_platform(lua_State * L) { - surf_parse = surf_wsL07_parse_bypass_platform; + //surf_parse = console_parse_platform_wsL07; + surf_parse_reset_callbacks(); SD_create_environment(NULL); return 0; } @@ -1151,8 +730,8 @@ 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 = surf_parse_bypass_platform; + //surf_parse = console_parse_platform; + surf_parse_reset_callbacks(); gras_create_environment(NULL); return 0; } @@ -1163,7 +742,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 = surf_parse_bypass_application; + //surf_parse = console_parse_application; MSG_launch_application(NULL); return 0; } @@ -1174,12 +753,12 @@ 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 = surf_parse_bypass_application; + //surf_parse = console_parse_application; gras_launch_application(NULL); return 0; } -static const luaL_Reg simgrid_funcs[] = { +static const luaL_Reg simgrid_functions[] = { {"create_environment", create_environment}, {"launch_application", launch_application}, {"debug", debug}, @@ -1202,22 +781,28 @@ static const luaL_Reg simgrid_funcs[] = { }; /* ********************************************************************************* */ -/* module management functions */ +/* 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) + +/** + * \brief Opens the simgrid Lua module. + * + * This function is called automatically by the Lua interpreter when some + * Lua code requires the "simgrid" module. + * + * \param L the Lua state + */ +int luaopen_simgrid(lua_State *L) { + XBT_DEBUG("luaopen_simgrid *****"); - //xbt_ctx_factory_to_use = "lua"; + /* Get the command line arguments from the lua interpreter */ 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? */ - /* Get the command line arguments from the lua interpreter */ + lua_getglobal(L, "arg"); /* if arg is a null value, it means we use lua only as a script to init platform * else it should be a table and then take arg in consideration @@ -1231,40 +816,77 @@ int luaopen_simgrid(lua_State * L) if (lua_isnil(L, -1)) { done = 1; } else { - xbt_assert1(lua_isstring(L, -1), + xbt_assert(lua_isstring(L, -1), "argv[%d] got from lua is no string", argc - 1); - xbt_assert2(argc < LUA_MAX_ARGS_COUNT, + xbt_assert(argc < LUA_MAX_ARGS_COUNT, "Too many arguments, please increase LUA_MAX_ARGS_COUNT in %s before recompiling SimGrid if you insist on having more than %d args on command line", __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 } + + /* Keep the context mechanism informed of our lua world today */ + sglua_maestro_state = L; + + /* initialize access to my tables by children Lua states */ + lua_newtable(L); + lua_setfield(L, LUA_REGISTRYINDEX, "simgrid.maestro_tables"); + + register_c_functions(L); + + return 1; +} + +/** + * \brief Returns whether a Lua state is the maestro state. + * \param L a Lua state + * \return true if this is maestro + */ +int sglua_is_maestro(lua_State* L) { + return L == sglua_maestro_state; +} + +/** + * \brief Returns the maestro state. + * \return the maestro Lua state + */ +lua_State* sglua_get_maestro(void) { + return sglua_maestro_state; +} + +/** + * \brief Makes the appropriate Simgrid functions available to the Lua world. + * \param L a Lua world + */ +void register_c_functions(lua_State *L) { + /* register the core C functions to lua */ - luaL_register(L, "simgrid", simgrid_funcs); + luaL_register(L, "simgrid", simgrid_functions); + /* register the task methods to lua */ - luaL_openlib(L, TASK_MODULE_NAME, Task_methods, 0); //create methods table,add it to the globals - luaL_newmetatable(L, TASK_MODULE_NAME); //create metatable for Task,add it to the Lua registry - luaL_openlib(L, 0, Task_meta, 0); // fill metatable + luaL_openlib(L, TASK_MODULE_NAME, task_functions, 0); // create methods table, add it to the globals + luaL_newmetatable(L, TASK_MODULE_NAME); // create metatable for Task, add it to the Lua registry + luaL_openlib(L, 0, task_meta, 0); // fill metatable lua_pushliteral(L, "__index"); - lua_pushvalue(L, -3); //dup methods table - lua_rawset(L, -3); //matatable.__index = methods + lua_pushvalue(L, -3); // dup methods table + lua_rawset(L, -3); // metatable.__index = methods lua_pushliteral(L, "__metatable"); - lua_pushvalue(L, -3); //dup methods table - lua_rawset(L, -3); //hide metatable:metatable.__metatable = methods - lua_pop(L, 1); //drop metatable + lua_pushvalue(L, -3); // dup methods table + lua_rawset(L, -3); // hide metatable:metatable.__metatable = methods + lua_pop(L, 1); // drop metatable /* register the hosts methods to lua */ - luaL_openlib(L, HOST_MODULE_NAME, Host_methods, 0); + luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0); luaL_newmetatable(L, HOST_MODULE_NAME); - luaL_openlib(L, 0, Host_meta, 0); + luaL_openlib(L, 0, host_meta, 0); lua_pushliteral(L, "__index"); lua_pushvalue(L, -3); lua_rawset(L, -3); @@ -1273,22 +895,48 @@ int luaopen_simgrid(lua_State * L) lua_rawset(L, -3); 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); + /* register the platform methods to lua */ + luaL_openlib(L, PLATF_MODULE_NAME, platf_functions, 0); + luaL_newmetatable(L, PLATF_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); +/** + * \brief Runs a Lua function as a new simulated process. + * \param argc number of arguments of the function + * \param argv name of the Lua function and array of its arguments + * \return result of the function + */ +static int run_lua_code(int argc, char **argv) +{ + XBT_DEBUG("Run lua code %s", argv[0]); - /*register the routes methods to lua */ - luaL_openlib(L, ROUTE_MODULE_NAME, Route_methods, 0); - luaL_newmetatable(L, LINK_MODULE_NAME); - lua_pop(L, 1); + lua_State *L = sglua_clone_maestro(); + int res = 1; - /* Keep the context mechanism informed of our lua world today */ - simgrid_lua_state = L; - return 1; + /* start the function */ + lua_getglobal(L, argv[0]); + xbt_assert(lua_isfunction(L, -1), + "The lua function %s does not seem to exist", argv[0]); + + /* push arguments onto the stack */ + int i; + for (i = 1; i < argc; i++) + lua_pushstring(L, argv[i]); + + /* call the function */ + _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)); + + /* retrieve result */ + if (lua_isnumber(L, -1)) { + res = lua_tonumber(L, -1); + lua_pop(L, 1); /* pop returned value */ + } + + XBT_DEBUG("Execution of Lua code %s is over", (argv ? argv[0] : "(null)")); + + return res; }