From 657f548c2a0af5ed612a7b22ff442b1f0295b61c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 27 Mar 2016 14:26:30 +0200 Subject: [PATCH] cosmetics in lua --- src/bindings/lua/lua_host.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp index 666ede6c1a..797dadef36 100644 --- a/src/bindings/lua/lua_host.cpp +++ b/src/bindings/lua/lua_host.cpp @@ -12,7 +12,7 @@ extern "C" { #include } -XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua bindings (host module)"); +XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua Host module"); #define HOST_MODULE_NAME "simgrid.host" #define HOST_FIELDNAME "__simgrid_host" @@ -20,11 +20,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua bindings (host module)"); /* simgrid.host API */ /* ********************************************************************************* */ -/** - * \brief Ensures that a value in the stack is a host and returns it. - * - * This function is called from C and helps to verify that a specific - * userdatum on the stack is in fact a sg_host_t. +/** @brief Ensures that the pointed stack value is an host userdatum and returns it. * * \param L a Lua state * \param index an index in the Lua stack @@ -32,16 +28,15 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua bindings (host module)"); */ sg_host_t sglua_check_host(lua_State * L, int index) { - sg_host_t *pi, ht; luaL_checktype(L, index, LUA_TTABLE); lua_getfield(L, index, HOST_FIELDNAME); - pi = (sg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME); + sg_host_t *pi = (sg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME); + lua_pop(L, 1); if (pi == NULL) XBT_ERROR("luaL_checkudata() returned NULL"); - ht = *pi; + sg_host_t ht = *pi; if (!ht) luaL_error(L, "null Host"); - lua_pop(L, 1); return ht; } @@ -58,17 +53,16 @@ static int l_host_get_by_name(lua_State * L) { const char *name = luaL_checkstring(L, 1); lua_remove(L, 1); /* remove the args from the stack */ - XBT_DEBUG("Getting host by name..."); + sg_host_t host = sg_host_by_name(name); - if (host == nullptr) - XBT_ERROR("sg_get_host_by_name failed, requested hostname: %s", name); + lua_ensure(host, "No host name '%s' found.", name); lua_newtable(L); /* table */ sg_host_t *lua_host = (sg_host_t *) lua_newuserdata(L, sizeof(sg_host_t)); /* table userdatum */ *lua_host = host; luaL_getmetatable(L, HOST_MODULE_NAME); /* table userdatum metatable */ lua_setmetatable(L, -2); /* table userdatum */ - lua_setfield(L, -2, HOST_FIELDNAME); /* table -- put the userdata as field of the table */ + lua_setfield(L, -2, HOST_FIELDNAME); /* table -- put the userdata as field of the table */ return 1; } -- 2.20.1