-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
lua_getfield(L, index, "__simgrid_host");
pi = (msg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME);
if (pi == NULL)
- luaL_typerror(L, index, HOST_MODULE_NAME);
+ XBT_ERROR("luaL_checkudata() returned NULL");
ht = *pi;
if (!ht)
luaL_error(L, "null Host");
{
const char *name = luaL_checkstring(L, 1);
XBT_DEBUG("Getting Host from name...");
- msg_host_t msg_host = MSG_get_host_by_name(name);
+ msg_host_t msg_host = MSG_host_by_name(name);
if (!msg_host) {
luaL_error(L, "null Host : MSG_get_host_by_name failed");
}
*/
static int l_host_destroy(lua_State *L)
{
- msg_host_t ht = sglua_check_host(L, 1);
- __MSG_host_priv_free(MSG_host_priv(ht));
+ //msg_host_t ht = sglua_check_host(L, 1);
+ //FIXME: not working..__MSG_host_priv_free(MSG_host_priv(ht));
return 0;
}
-static const luaL_reg host_functions[] = {
+static const luaL_Reg host_functions[] = {
{"get_by_name", l_host_get_by_name},
{"name", l_host_get_name},
{"number", l_host_number},
return 1;
}
-static const luaL_reg host_meta[] = {
+static const luaL_Reg host_meta[] = {
{"__tostring", l_host_tostring},
{0, 0}
};
void sglua_register_host_functions(lua_State* L)
{
/* create a table simgrid.host and fill it with host functions */
- luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);
+ lua_newtable(L);
+ luaL_setfuncs(L, host_functions, 0);
+ // Not sure we really need this one here...
+ /*lua_pushvalue(L, -1);*/
+ /*lua_setglobal(L, HOST_MODULE_NAME);*/
+
+ /*luaL_openlib(L, HOST_MODULE_NAME, host_functions, 0);*/
/* simgrid.host */
/* create the metatable for host, add it to the Lua registry */
luaL_newmetatable(L, HOST_MODULE_NAME);
/* simgrid.host mt */
/* fill the metatable */
- luaL_openlib(L, NULL, host_meta, 0);
+ luaL_setfuncs(L, host_meta, 0);
+ /*luaL_openlib(L, NULL, host_meta, 0);*/
/* simgrid.host mt */
+ /**
+ * Copy the table and push it onto the stack.
+ * Required for the lua_setfield call below.
+ */
lua_pushvalue(L, -2);
/* simgrid.host mt simgrid.host */
/* metatable.__index = simgrid.host
* we put the host functions inside the host userdata itself:
* this allows to write my_host:method(args) for
* simgrid.host.method(my_host, args) */
- lua_setfield(L, -2, "__index");
+ lua_setfield(L, -1, "__index");
/* simgrid.host mt */
- lua_pop(L, 2);
+ lua_setmetatable(L, -2);
/* -- */
}