X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..19e1048a7009c4144b0f361ad85fb9dff44761ea:/src/bindings/lua/lua_host.cpp diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp index 8f7cb8640f..cdd2ef4672 100644 --- a/src/bindings/lua/lua_host.cpp +++ b/src/bindings/lua/lua_host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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. */ @@ -6,31 +6,31 @@ /* SimGrid Lua bindings */ #include "lua_private.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "xbt/asserts.h" #include -XBT_LOG_NEW_DEFAULT_CATEGORY(lua_host, "Lua Host module"); +constexpr char HOST_MODULE_NAME[] = "simgrid.host"; +constexpr char HOST_FIELDNAME[] = "__simgrid_host"; -#define HOST_MODULE_NAME "simgrid.host" -#define HOST_FIELDNAME "__simgrid_host" /* ********************************************************************************* */ /* simgrid.host API */ /* ********************************************************************************* */ -/** @brief Ensures that the pointed stack value is an host userdatum and returns it. +/** @brief Ensures that the pointed stack value is a host userdatum 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 + * @param L a Lua state + * @param index an index in the Lua stack + * @return the C host corresponding to this Lua host */ sg_host_t sglua_check_host(lua_State * L, int index) { luaL_checktype(L, index, LUA_TTABLE); lua_getfield(L, index, HOST_FIELDNAME); - sg_host_t *pi = (sg_host_t *) luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME); + auto* pi = static_cast(luaL_checkudata(L, lua_gettop(L), HOST_MODULE_NAME)); lua_pop(L, 1); - if (pi == nullptr) - XBT_ERROR("luaL_checkudata() returned nullptr"); + xbt_assert(pi != nullptr, "luaL_checkudata() returned nullptr"); sg_host_t ht = *pi; if (not ht) luaL_error(L, "null Host"); @@ -38,10 +38,10 @@ sg_host_t sglua_check_host(lua_State * L, int index) } /** - * \brief Returns a host given its name. This is a lua function. + * @brief Returns a host given its name. This is a lua function. * - * \param L a Lua state - * \return number of values returned to Lua + * @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 will be pushed onto the stack @@ -55,7 +55,7 @@ static int l_host_get_by_name(lua_State * L) 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 */ + auto* lua_host = static_cast(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 */ @@ -65,62 +65,59 @@ static int l_host_get_by_name(lua_State * L) } /** - * \brief Returns the name of a host. - * \param L a Lua state - * \return number of values returned to Lua + * @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) { - sg_host_t ht = sglua_check_host(L, 1); + auto const* ht = sglua_check_host(L, 1); lua_pushstring(L, ht->get_cname()); return 1; } /** - * \brief Returns the number of existing hosts. - * \param L a Lua state - * \return number of values returned to Lua + * @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) { - xbt_dynar_t hosts = sg_hosts_as_dynar(); - lua_pushinteger(L, xbt_dynar_length(hosts)); - xbt_dynar_free(&hosts); + lua_pushinteger(L, simgrid::s4u::Engine::get_instance()->get_host_count()); return 1; } /** - * \brief Returns the host given its index. - * \param L a Lua state - * \return number of values returned to Lua + * @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); - xbt_dynar_t hosts = sg_hosts_as_dynar(); - sg_host_t host = xbt_dynar_get_as(hosts,index - 1,sg_host_t);// lua indexing start by 1 (lua[1] <=> C[0]) + lua_Integer index = luaL_checkinteger(L, 1); + std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + sg_host_t host = hosts[index - 1]; // lua indexing start by 1 (lua[1] <=> C[0]) lua_newtable(L); /* create a table, put the userdata on top of it */ - sg_host_t *lua_host = (sg_host_t *) lua_newuserdata(L, sizeof(sg_host_t)); + auto* lua_host = static_cast(lua_newuserdata(L, sizeof(sg_host_t))); *lua_host = host; luaL_getmetatable(L, HOST_MODULE_NAME); lua_setmetatable(L, -2); lua_setfield(L, -2, HOST_FIELDNAME); /* put the userdata as field of the table */ - xbt_dynar_free(&hosts); return 1; } /** - * \brief Returns the value of a host property. - * \param L a Lua state - * \return number of values returned to Lua + * @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 @@ -128,23 +125,23 @@ static int l_host_at(lua_State * L) */ static int l_host_get_property_value(lua_State * L) { - sg_host_t ht = sglua_check_host(L, 1); + const_sg_host_t ht = sglua_check_host(L, 1); const char *prop = luaL_checkstring(L, 2); lua_pushstring(L, sg_host_get_property_value(ht,prop)); return 1; } /** - * \brief Destroys a host. - * \param L a Lua state - * \return number of values returned to Lua + * @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 l_host_destroy(lua_State *L) { - //sg_host_t ht = sglua_check_host(L, 1); - //FIXME: not working..__MSG_host_priv_free(MSG_host_priv(ht)); + sg_host_t ht = sglua_check_host(L, 1); + ht->destroy(); return 0; } @@ -161,9 +158,9 @@ static const luaL_Reg host_functions[] = { }; /** - * \brief Returns a string representation of a host. - * \param L a Lua state - * \return number of values returned to Lua + * @brief Returns a string representation of a host. + * @param L a Lua state + * @return number of values returned to Lua * * - Argument 1 (userdata): a host * - Return value (string): a string describing this host @@ -174,17 +171,14 @@ static int l_host_tostring(lua_State * L) return 1; } -static const luaL_Reg host_meta[] = { - {"__tostring", l_host_tostring}, - {0, 0} -}; +static const luaL_Reg host_meta[] = {{"__tostring", l_host_tostring}, {nullptr, nullptr}}; /** - * \brief Registers the host functions into the table simgrid.host. + * @brief Registers the host functions into the table simgrid.host. * * Also initialize the metatable of the host userdata type. * - * \param L a lua state + * @param L a lua state */ void sglua_register_host_functions(lua_State* L) { @@ -208,7 +202,7 @@ void sglua_register_host_functions(lua_State* L) /* metatable.__index = simgrid.host * we put the host functions inside the host userdata itself: - * this allows to write my_host:method(args) for + * this allows one to write my_host:method(args) for * simgrid.host.method(my_host, args) */ lua_setfield(L, -2, "__index"); /* simgrid simgrid.host mt */