finish the transition netcards->netpoints in the code

[simgrid.git] / src / bindings / lua / lua_platf.cpp

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index ca263d2..c8434e3 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -7,11 +7,12 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.h"
-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
 #include "surf/surf_routing.h"
-#include <string.h>
 #include <ctype.h>
+#include <string.h>
 
 extern "C" {
 #include <lauxlib.h>
@@ -49,7 +50,6 @@ int console_open(lua_State *L) {
   sg_platf_begin();
 
   storage_register_callbacks();
-  routing_register_callbacks();
 
   return 0;
 }
@@ -286,25 +286,21 @@ int  console_add_link(lua_State *L) {
  * add Router to AS components
  */
 int console_add_router(lua_State* L) {
-  s_sg_platf_router_cbarg_t router;
-  memset(&router,0,sizeof(router));
-  int type;
-
   lua_ensure(lua_istable(L, -1),
       "Bad Arguments to create router, Should be a table with named arguments");
 
   lua_pushstring(L, "id");
-  type = lua_gettable(L, -2);
+  int type = lua_gettable(L, -2);
   lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any link and must be a string.");
-  router.id = lua_tostring(L, -1);
+  const char* name = lua_tostring(L, -1);
   lua_pop(L,1);
 
   lua_pushstring(L,"coord");
   lua_gettable(L,-2);
-  router.coord = lua_tostring(L, -1);
+  const char* coords = lua_tostring(L, -1);
   lua_pop(L,1);
 
-  sg_platf_new_router(&router);
+  sg_platf_new_router(name, coords);
 
   return 0;
 }
@@ -324,7 +320,7 @@ int console_add_route(lua_State *L) {
   type = lua_gettable(L,-2);
   lua_ensure(type == LUA_TSTRING, "Attribute 'src' must be specified for any route and must be a string.");
   const char *srcName = lua_tostring(L, -1);
-  route.src = sg_netcard_by_name_or_null(srcName);
+  route.src           = sg_netpoint_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);
 
@@ -332,7 +328,7 @@ int console_add_route(lua_State *L) {
   type = lua_gettable(L,-2);
   lua_ensure(type == LUA_TSTRING, "Attribute 'dest' must be specified for any route and must be a string.");
   const char *dstName = lua_tostring(L, -1);
-  route.dst = sg_netcard_by_name_or_null(dstName);
+  route.dst           = sg_netpoint_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);
 
@@ -393,28 +389,28 @@ int console_add_ASroute(lua_State *L) {
   lua_pushstring(L, "src");
   lua_gettable(L, -2);
   const char *srcName = lua_tostring(L, -1);
-  ASroute.src = sg_netcard_by_name_or_null(srcName);
+  ASroute.src         = sg_netpoint_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);
   const char *dstName = lua_tostring(L, -1);
-  ASroute.dst = sg_netcard_by_name_or_null(dstName);
+  ASroute.dst         = sg_netpoint_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);
+  ASroute.gw_src   = sg_netpoint_by_name_or_null(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);
+  ASroute.gw_dst = sg_netpoint_by_name_or_null(name);
   lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", name);
   lua_pop(L, 1);
 
@@ -490,11 +486,12 @@ int console_AS_open(lua_State *L) {
  s_sg_platf_AS_cbarg_t AS;
  AS.id = id;
  AS.routing = mode_int;
- simgrid::s4u::As *new_as = sg_platf_new_AS_begin(&AS);
+ simgrid::s4u::NetZone* new_as = sg_platf_new_AS_begin(&AS);
 
  /* 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 */
+ simgrid::s4u::NetZone** lua_as =
+     (simgrid::s4u::NetZone**)lua_newuserdata(L, sizeof(simgrid::s4u::NetZone*)); /* table userdatum */
  *lua_as = new_as;
  luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
  lua_setmetatable(L, -2);                 /* table userdatum */