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 )
}
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 */
*/
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);
static int Task_send(lua_State * L)
{
//stackDump("send ",L);
- m_task_t tk = checkTask(L, -2);
- const char *mailbox = luaL_checkstring(L, -1);
+ 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);
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;
}
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;
}
return 1;
}
+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);
+
+ 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)
+ switch (res) {
+ case MSG_TIMEOUT:
+ XBT_ERROR("MSG_task_receive failed : Timeout");
+ break;
+ case MSG_TRANSFER_FAILURE:
+ XBT_ERROR("MSG_task_receive failed : Transfer Failure");
+ break;
+ case MSG_HOST_FAILURE:
+ XBT_ERROR("MSG_task_receive failed : Host Failure ");
+ break;
+ default:
+ XBT_ERROR
+ ("MSG_task_receive failed : Unexpected error , please report this bug");
+ break;
+ }
+ return 1;
+}
+
+/**
+ * Static Binding for the Splay methods : event.sleep :
+ * it use MSG_task_irecv with MSG_comm_wait
+ */
+static int Task_splay_irecv(lua_State *L)
+{
+ m_task_t task = NULL;
+ msg_comm_t comm = NULL; //current communication to receive
+ const char *mailbox = luaL_checkstring(L, -2);
+ double timeout = luaL_checknumber(L, -1);
+ comm = MSG_task_irecv(&task, mailbox);
+ MSG_comm_wait(comm, timeout);
+ if (MSG_comm_get_status(comm) == MSG_OK)
+ {
+ XBT_DEBUG("Receiving task : %s",MSG_task_get_name(task));
+ lua_State *sender_stack = MSG_task_get_data(task);
+ lua_xmove(sender_stack, L, 1); // copy the data directly from sender's stack
+ MSG_task_set_data(task, NULL);
+ }
+ MSG_comm_destroy(comm);
+ return 1;
+}
+
+static int Task_splay_isend(lua_State *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_task_isend(tk, mailbox);
+
+ return 1;
+}
+
static const luaL_reg Task_methods[] = {
{"new", Task_new},
{"name", Task_get_name},
{"destroy", Task_destroy},
{"send", Task_send},
{"recv", Task_recv},
+ {"recv_timeout",Task_recv_with_timeout},
+ {"splay_recv",Task_splay_irecv},
+ {"iSend",Task_splay_isend},
{0, 0}
};
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");
+ 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));
static int Host_self(lua_State * L)
{
- m_host_t host = MSG_host_self();
- lua_newtable(L);
- m_host_t *lua_host =(m_host_t *)lua_newuserdata(L,sizeof(m_host_t));
- *lua_host = host;
- luaL_getmetatable(L, HOST_MODULE_NAME);
- lua_setmetatable(L, -2);
- lua_setfield(L, -2, "__simgrid_host");
- return 1;
+ m_host_t host = MSG_host_self();
+ lua_newtable(L);
+ m_host_t *lua_host =(m_host_t *)lua_newuserdata(L,sizeof(m_host_t));
+ *lua_host = host;
+ luaL_getmetatable(L, HOST_MODULE_NAME);
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__simgrid_host");
+ return 1;
}
return 1;
}
+static int Host_sleep(lua_State *L)
+{
+ int time = luaL_checknumber(L, -1);
+ MSG_process_sleep(time);
+ return 1;
+}
+
+static int Host_destroy(lua_State *L)
+{
+ m_host_t ht = checkHost(L, -1);
+ __MSG_host_destroy(ht);
+ return 1;
+}
+
/* ********************************************************************************* */
/* lua_stub_generator functions */
/* ********************************************************************************* */
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 trace_start(lua_State *L)
{
+#ifdef HAVE_TRACING
TRACE_start();
+#endif
return 1;
}
static int trace_category(lua_State * L)
{
- /* _XBT_GNUC_UNUSED to pass compilation in paranoid mode without tracing
- * support, where TRACE_category(x) is preprocessed to nothing. */
- const char *category _XBT_GNUC_UNUSED = luaL_checkstring(L, 1);
- TRACE_category(category);
+#ifdef HAVE_TRACING
+ TRACE_category(luaL_checkstring(L, 1));
+#endif
return 1;
}
static int trace_set_task_category(lua_State *L)
{
- /* _XBT_GNUC_UNUSED as above */
- m_task_t tk _XBT_GNUC_UNUSED = checkTask(L, -2);
- const char *category _XBT_GNUC_UNUSED = luaL_checkstring(L, -1);
- TRACE_msg_set_task_category(tk, category);
+#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 *******************************************//
{"number", Host_number},
{"at", Host_at},
{"self",Host_self},
- {"getPropValue",Host_get_property_value},
+ {"getPropValue", Host_get_property_value},
+ {"sleep", Host_sleep},
+ {"destroy",Host_destroy},
// Bypass XML Methods
- {"new", console_add_host},
{"setFunction", console_set_function},
+ {"setProperty", console_host_set_property},
{0, 0}
};
*/
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}
};
* 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;
/* Start the co-routine */
lua_getglobal(L, argv[0]);
- xbt_assert1(lua_isfunction(L, -1),
+ xbt_assert(lua_isfunction(L, -1),
"The lua function %s does not seem to exist", argv[0]);
// push arguments onto the stack
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));
+ 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)) {
}
// 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;
}
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;
}
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;
}
{
/* 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); // 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? */
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
}
/* register the core C functions to lua */
luaL_register(L, "simgrid", simgrid_funcs);
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);
