XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
-#define TASK_MODULE_NAME "simgrid.Task"
-#define HOST_MODULE_NAME "simgrid.Host"
+#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"
-
-/**
- * @brief Userdata type for tasks.
- */
-typedef struct s_sglua_task {
- m_task_t msg_task; /**< the task, or NULL if I sent it to someone else */
-} s_sglua_task_t, *sglua_task_t;
+#define LINK_MODULE_NAME "simgrid.link"
+#define ROUTE_MODULE_NAME "simgrid.route"
+#define PLATF_MODULE_NAME "simgrid.platf"
static lua_State* sglua_maestro_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 sglua_checktask(lua_State* L, int index)
{
- sglua_stack_dump("checkTask: ", L);
+ sglua_stack_dump("check task: ", L);
luaL_checktype(L, index, LUA_TTABLE);
/* ... task ... */
lua_getfield(L, index, "__simgrid_task");
* - computation size (integer)
* - communication size (integer)
*/
-static int Task_new(lua_State* L)
+static int l_task_new(lua_State* L)
{
XBT_DEBUG("Task new");
const char* name = luaL_checkstring(L, 1);
return 1;
}
-static int Task_get_name(lua_State* L)
+static int l_task_get_name(lua_State* L)
{
- m_task_t task = checkTask(L, 1);
+ 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)
+static int l_task_computation_duration(lua_State* L)
{
- m_task_t task = checkTask(L, 1);
+ 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)
+static int l_task_execute(lua_State* L)
{
- m_task_t task = checkTask(L, 1);
+ m_task_t task = sglua_checktask(L, 1);
int res = MSG_task_execute(task);
lua_pushnumber(L, res);
return 1;
}
-static int Task_send(lua_State* L)
+static int l_task_send(lua_State* L)
{
- m_task_t task = checkTask(L, 1);
+ m_task_t task = sglua_checktask(L, 1);
const char* mailbox = luaL_checkstring(L, 2);
/* task mailbox */
lua_settop(L, 1);
return 0;
}
-static int Task_recv_with_timeout(lua_State *L)
+static int l_task_recv_with_timeout(lua_State *L)
{
m_task_t task = NULL;
const char* mailbox = luaL_checkstring(L, 1);
return 1;
}
-static int Task_recv(lua_State * L)
+static int l_task_recv(lua_State * L)
{
lua_pushnumber(L, -1.0);
- return Task_recv_with_timeout(L);
+ return l_task_recv_with_timeout(L);
}
-static const luaL_reg Task_methods[] = {
- {"new", Task_new},
- {"name", Task_get_name},
- {"computation_duration", Task_computation_duration},
- {"execute", Task_execute},
- {"send", Task_send},
- {"recv", Task_recv},
- {"recv_timeout", Task_recv_with_timeout},
+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},
+ {"recv_timeout", l_task_recv_with_timeout},
{NULL, NULL}
};
-static int Task_gc(lua_State* L)
+static int l_task_gc(lua_State* L)
{
/* ctask */
m_task_t task = *((m_task_t*) luaL_checkudata(L, 1, TASK_MODULE_NAME));
return 0;
}
-static int Task_tostring(lua_State* L)
+static int l_task_tostring(lua_State* L)
{
- m_task_t task = checkTask(L, 1);
+ m_task_t task = sglua_checktask(L, 1);
lua_pushfstring(L, "Task: %p", task);
return 1;
}
-static const luaL_reg Task_meta[] = {
- {"__gc", Task_gc},
- {"__tostring", Task_tostring},
+static const luaL_reg task_meta[] = {
+ {"__gc", l_task_gc},
+ {"__tostring", l_task_tostring},
{NULL, NULL}
};
/**
* 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);
return ht;
}
-static int Host_get_by_name(lua_State * L)
+static int l_host_get_by_name(lua_State * L)
{
const char *name = luaL_checkstring(L, 1);
XBT_DEBUG("Getting Host from name...");
return 1;
}
-static int Host_get_name(lua_State * L)
+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)
+static int l_host_number(lua_State * L)
{
lua_pushnumber(L, MSG_get_host_number());
return 1;
}
-static int Host_at(lua_State * L)
+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])
}
-static int Host_self(lua_State * L)
+static int l_host_self(lua_State * L)
{
/* -- */
m_host_t host = MSG_host_self();
return 1;
}
-static int Host_get_property_value(lua_State * L)
+static int l_host_get_property_value(lua_State * L)
{
- m_host_t ht = checkHost(L, -2);
- const char *prop = luaL_checkstring(L, -1);
+ 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;
}
-static int Host_sleep(lua_State *L)
+static int l_host_sleep(lua_State *L)
{
- int time = luaL_checknumber(L, -1);
+ int time = luaL_checknumber(L, 1);
MSG_process_sleep(time);
return 1;
}
-static int Host_destroy(lua_State *L)
+static int l_host_destroy(lua_State *L)
{
- m_host_t ht = checkHost(L, -1);
+ m_host_t ht = sglua_checkhost(L, 1);
__MSG_host_destroy(ht);
return 1;
}
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 ******************************************* //
/*
* Host Methods
*/
-static const luaL_reg Host_methods[] = {
- {"getByName", Host_get_by_name},
- {"name", Host_get_name},
- {"number", Host_number},
- {"at", Host_at},
- {"self", Host_self},
- {"getPropValue", Host_get_property_value},
- {"sleep", Host_sleep},
- {"destroy", Host_destroy},
+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
- {"setFunction", console_set_function},
- {"setProperty", console_host_set_property},
+ {"set_function", console_set_function},
+ {"set_property", console_host_set_property},
{NULL, NULL}
};
-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)
+static int l_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},
+static const luaL_reg host_meta[] = {
+ {"__tostring", l_host_tostring},
{0, 0}
};
/*
* 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_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}
};
/*
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;
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;
*/
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;
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;
}
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;
}
-static const luaL_Reg simgrid_funcs[] = {
+static const luaL_Reg simgrid_functions[] = {
{"create_environment", create_environment},
{"launch_application", launch_application},
{"debug", debug},
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_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
+ 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_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
/* 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);
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);
- 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);
+ /* 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);
}