X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f37dba04ea44bc979a25129f10b18797b6fec1e..1b89437671ba572a199dd4ff5766ba82720cdf03:/src/bindings/lua/lua_host.cpp

diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp
index 3943a7019b..298f30fd1c 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-2020. 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,13 +6,13 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.hpp"
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include <lauxlib.h>
 
-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                                   */
 /* ********************************************************************************* */
@@ -27,10 +27,9 @@ 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<sg_host_t*>(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");
@@ -55,7 +54,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<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 */
@@ -74,7 +73,7 @@ static int l_host_get_by_name(lua_State * L)
  */
 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;
 }
@@ -88,9 +87,7 @@ static int l_host_get_name(lua_State * L)
  */
 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;
 }
 
@@ -104,16 +101,15 @@ static int l_host_number(lua_State * L)
  */
 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<sg_host_t> 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<sg_host_t*>(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;
 }
 
@@ -128,7 +124,7 @@ 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;
@@ -143,8 +139,8 @@ static int l_host_get_property_value(lua_State * L)
  */
 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;
 }
 
@@ -208,7 +204,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 */