X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4940fad595cbddbcfa32102b953120f25d95b8d6..831de10adaaf8910940aa280e2ac2dd075b5ffe5:/src/bindings/lua/lua_platf.cpp

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index c371d70083..8e8bffabf9 100644
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -22,7 +22,7 @@ extern "C" {
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
 
-#define PLATF_MODULE_NAME "simgrid.platf"
+#define PLATF_MODULE_NAME "simgrid.engine"
 #define AS_FIELDNAME   "__simgrid_as"
 
 /* ********************************************************************************* */
@@ -41,7 +41,7 @@ static const luaL_Reg platf_functions[] = {
     {"router_new", console_add_router},
     {"route_new", console_add_route},
     {"ASroute_new", console_add_ASroute},
-    {NULL, NULL}
+    {nullptr, nullptr}
 };
 
 int console_open(lua_State *L) {
@@ -65,7 +65,7 @@ int console_add_backbone(lua_State *L) {
   memset(&link,0,sizeof(link));
   int type;
 
-  link.properties = NULL;
+  link.properties = nullptr;
 
   lua_ensure(lua_istable(L, -1),"Bad Arguments to create backbone in Lua. Should be a table with named arguments.");
 
@@ -162,7 +162,7 @@ int console_add_host(lua_State *L) {
   type = lua_gettable(L, -2);
   lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER,
       "Attribute 'speed' must be specified for host and must either be a string (in the correct format; check documentation) or a number.");
-  host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL);
+  host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr);
   if (type == LUA_TNUMBER)
     xbt_dynar_push_as(host.speed_per_pstate, double, lua_tointeger(L, -1));
   else // LUA_TSTRING
@@ -325,13 +325,17 @@ int console_add_route(lua_State *L) {
   lua_pushstring(L,"src");
   type = lua_gettable(L,-2);
   lua_ensure(type == LUA_TSTRING, "Attribute 'src' must be specified for any route and must be a string.");
-  route.src = lua_tostring(L, -1);
+  const char *srcName = lua_tostring(L, -1);
+  route.src = sg_netcard_by_name_or_null(srcName);
+  lua_ensure(route.src != nullptr, "Attribute 'src=%s' of route does not name a node.", srcName);
   lua_pop(L,1);
 
   lua_pushstring(L,"dest");
   type = lua_gettable(L,-2);
   lua_ensure(type == LUA_TSTRING, "Attribute 'dest' must be specified for any route and must be a string.");
-  route.dst = lua_tostring(L, -1);
+  const char *dstName = lua_tostring(L, -1);
+  route.dst = sg_netcard_by_name_or_null(dstName);
+  lua_ensure(route.dst != nullptr, "Attribute 'dst=%s' of route does not name a node.", dstName);
   lua_pop(L,1);
 
   lua_pushstring(L,"links");
@@ -376,8 +380,8 @@ int console_add_route(lua_State *L) {
   }
   lua_pop(L,1);
 
-  route.gw_src = NULL;
-  route.gw_dst = NULL;
+  route.gw_src = nullptr;
+  route.gw_dst = nullptr;
 
   sg_platf_new_route(&route);
 
@@ -390,26 +394,30 @@ int console_add_ASroute(lua_State *L) {
 
   lua_pushstring(L, "src");
   lua_gettable(L, -2);
-  ASroute.src = lua_tostring(L, -1);
+  const char *srcName = lua_tostring(L, -1);
+  ASroute.src = sg_netcard_by_name_or_null(srcName);
+  lua_ensure(ASroute.src != nullptr, "Attribute 'src=%s' of AS route does not name a node.", srcName);
   lua_pop(L, 1);
 
   lua_pushstring(L, "dst");
   lua_gettable(L, -2);
-  ASroute.dst = lua_tostring(L, -1);
+  const char *dstName = lua_tostring(L, -1);
+  ASroute.dst = sg_netcard_by_name_or_null(dstName);
+  lua_ensure(ASroute.dst != nullptr, "Attribute 'dst=%s' of AS route does not name a node.", dstName);
   lua_pop(L, 1);
 
   lua_pushstring(L, "gw_src");
   lua_gettable(L, -2);
   const char *name = lua_tostring(L, -1);
   ASroute.gw_src = sg_netcard_by_name_or_null(name);
-  lua_ensure(ASroute.gw_src, "Attribute 'gw_src' of AS route does not name a valid machine: %s", name);
+  lua_ensure(ASroute.gw_src, "Attribute 'gw_src=%s' of AS route does not name a valid node", name);
   lua_pop(L, 1);
 
   lua_pushstring(L, "gw_dst");
   lua_gettable(L, -2);
   name = lua_tostring(L, -1);
   ASroute.gw_dst = sg_netcard_by_name_or_null(name);
-  lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst' of AS route does not name a valid machine: %s", name);
+  lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", name);
   lua_pop(L, 1);
 
   lua_pushstring(L,"links");
@@ -484,9 +492,17 @@ int console_AS_open(lua_State *L) {
  s_sg_platf_AS_cbarg_t AS;
  AS.id = id;
  AS.routing = mode_int;
- sg_platf_new_AS_begin(&AS);
+ simgrid::s4u::As *new_as = sg_platf_new_AS_begin(&AS);
 
- return 0;
+ /* Build a Lua representation of the new AS on the stack */
+ lua_newtable(L);
+ simgrid::s4u::As **lua_as = (simgrid::s4u::As **) lua_newuserdata(L, sizeof(simgrid::s4u::As *)); /* table userdatum */
+ *lua_as = new_as;
+ luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
+ lua_setmetatable(L, -2);                 /* table userdatum */
+ lua_setfield(L, -2, AS_FIELDNAME);       /* table -- put the userdata as field of the table */
+
+ return 1;
 }
 int console_AS_seal(lua_State *L) {
   XBT_DEBUG("Sealing AS");
@@ -520,7 +536,7 @@ int console_host_set_property(lua_State *L) {
   sg_host_t host = sg_host_by_name(name);
   lua_ensure(host, "no host '%s' found",name);
   xbt_dict_t props = sg_host_get_properties(host);
-  xbt_dict_set(props,prop_id,xbt_strdup(prop_value),NULL);
+  xbt_dict_set(props,prop_id,xbt_strdup(prop_value),nullptr);
 
   return 0;
 }
@@ -533,7 +549,7 @@ void sglua_register_platf_functions(lua_State* L)
 {
   lua_getglobal(L, "simgrid");     /* simgrid */
   luaL_newlib(L, platf_functions); /* simgrid simgrid.platf */
-  lua_setfield(L, -2, "platf");    /* simgrid */
+  lua_setfield(L, -2, "engine");   /* simgrid */
 
   lua_pop(L, 1);                   /* -- */
 }