remove the s_sg_platf_router_cbarg_t structure

[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 9ea766a..c662f75 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"
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.h"

-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/routing/NetCard.hpp"

 #include "src/surf/network_interface.hpp"
 #include "src/surf/network_interface.hpp"

+#include "src/surf/xml/platf_private.hpp"

 #include "surf/surf_routing.h"
 #include "surf/surf_routing.h"

-#include <string.h>

 #include <ctype.h>
 #include <ctype.h>

+#include <string.h>

 
 extern "C" {
 #include <lauxlib.h>
 
 extern "C" {
 #include <lauxlib.h>


@@ -49,7 +50,6 @@ int console_open(lua_State *L) {
   sg_platf_begin();
 
   storage_register_callbacks();
   sg_platf_begin();
 
   storage_register_callbacks();

-  routing_register_callbacks();

 
   return 0;
 }
 
   return 0;
 }


@@ -162,11 +162,10 @@ 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.");
   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), nullptr);

   if (type == LUA_TNUMBER)
   if (type == LUA_TNUMBER)

-    xbt_dynar_push_as(host.speed_per_pstate, double, lua_tointeger(L, -1));
+    host.speed_per_pstate.push_back(lua_tointeger(L, -1));

   else // LUA_TSTRING
   else // LUA_TSTRING

-    xbt_dynar_push_as(host.speed_per_pstate, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));
+    host.speed_per_pstate.push_back(surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));

   lua_pop(L, 1);
 
   // get core
   lua_pop(L, 1);
 
   // get core


@@ -197,7 +196,6 @@ int console_add_host(lua_State *L) {
   lua_pop(L, 1);
 
   sg_platf_new_host(&host);
   lua_pop(L, 1);
 
   sg_platf_new_host(&host);

-  xbt_dynar_free(&host.speed_per_pstate);

 
   return 0;
 }
 
   return 0;
 }


@@ -288,25 +286,21 @@ int  console_add_link(lua_State *L) {
  * add Router to AS components
  */
 int console_add_router(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");
   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.");
   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);
   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);
 
   lua_pop(L,1);
 

-  sg_platf_new_router(&router);
+  sg_platf_new_router(name, coords);

 
   return 0;
 }
 
   return 0;
 }


@@ -325,13 +319,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.");
   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.");
   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");
   lua_pop(L,1);
 
   lua_pushstring(L,"links");


@@ -390,26 +388,30 @@ int console_add_ASroute(lua_State *L) {
 
   lua_pushstring(L, "src");
   lua_gettable(L, -2);
 
   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);
   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_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_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");
   lua_pop(L, 1);
 
   lua_pushstring(L,"links");


@@ -484,11 +486,12 @@ int console_AS_open(lua_State *L) {
  s_sg_platf_AS_cbarg_t AS;
  AS.id = id;
  AS.routing = mode_int;
  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);
 
  /* 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 */
  *lua_as = new_as;
  luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
  lua_setmetatable(L, -2);                 /* table userdatum */