Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[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 1200309..8065bc6 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -7,8 +7,7 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.h"
-#include "simgrid/platf_interface.h"
-#include "surf/surfxml_parse.h"
+#include "src/surf/xml/platf.hpp"
 #include "surf/surf_routing.h"
 #include <string.h>
 #include <ctype.h>
@@ -96,8 +95,6 @@ int console_add_backbone(lua_State *L) {
   link.latency = surf_parse_get_time(lua_tostring(L, -1),"latency of backbone",link.id);
   lua_pop(L, 1);
 
-  link.initiallyOn = 1;
-
   lua_pushstring(L, "sharing_policy");
   type = lua_gettable(L, -2);
   const char* policy = lua_tostring(L, -1);
@@ -160,12 +157,11 @@ int console_add_host___link(lua_State *L) {
 int console_add_host(lua_State *L) {
   s_sg_platf_host_cbarg_t host;
   memset(&host,0,sizeof(host));
-  int state, type;
+  int type;
 
   // we get values from the table passed as argument
   if (!lua_istable(L, -1)) {
-    XBT_ERROR
-        ("Bad Arguments to create host. Should be a table with named arguments");
+    XBT_ERROR("Bad Arguments to create host. Should be a table with named arguments");
     return -1;
   }
 
@@ -202,31 +198,12 @@ int console_add_host(lua_State *L) {
     host.core_amount = 1;
   lua_pop(L, 1);
 
-  //get power_scale
-  lua_pushstring(L, "availability");
-  lua_gettable(L, -2);
-  if(!lua_isnumber(L,-1)) host.speed_scale = 1;// Default value
-  else host.speed_scale = lua_tonumber(L, -1);
-  lua_pop(L, 1);
-
   //get power_trace
   lua_pushstring(L, "availability_file");
   lua_gettable(L, -2);
   host.speed_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  //get state initial
-  lua_pushstring(L, "state");
-  lua_gettable(L, -2);
-  if(!lua_isnumber(L,-1)) state = 1;// Default value
-  else state = lua_tonumber(L, -1);
-  lua_pop(L, 1);
-
-  if (state)
-    host.initiallyOn = 1;
-  else
-    host.initiallyOn = 0;
-
   //get trace state
   lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
@@ -304,15 +281,6 @@ int  console_add_link(lua_State *L) {
   link.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  //get state_initial value
-  lua_pushstring(L, "state");
-  lua_gettable(L, -2);
-  if (!lua_isnumber(L,-1) || lua_tonumber(L, -1))
-    link.initiallyOn = 1;
-  else
-    link.initiallyOn = 0;
-  lua_pop(L, 1);
-
   //get policy value
   lua_pushstring(L, "sharing_policy");
   lua_gettable(L, -2);
@@ -361,8 +329,6 @@ int console_add_router(lua_State* L) {
   return 0;
 }
 
-#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
-
 int console_add_route(lua_State *L) {
   XBT_DEBUG("Adding route");
   s_sg_platf_route_cbarg_t route;
@@ -373,7 +339,7 @@ int console_add_route(lua_State *L) {
   surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
 
   if (! lua_istable(L, -1)) {
-    XBT_ERROR("Bad Arguments to create a route. Should be a table with named arguments");
+    XBT_ERROR("Bad Arguments to add a route. Should be a table with named arguments");
     return -1;
   }
 
@@ -448,21 +414,24 @@ int console_add_ASroute(lua_State *L) {
 
   lua_pushstring(L, "gw_src");
   lua_gettable(L, -2);
-  ASroute.gw_src = sg_netcard_by_name_or_null(lua_tostring(L, -1));
+  const char *name = lua_tostring(L, -1);
+  ASroute.gw_src = sg_netcard_by_name_or_null(name);
+  if (ASroute.gw_src == NULL) {
+    XBT_ERROR("Attribute 'gw_src' of AS route does not name a valid machine: %s", name);
+    return -1;
+  }
   lua_pop(L, 1);
 
   lua_pushstring(L, "gw_dst");
   lua_gettable(L, -2);
-  ASroute.gw_dst = sg_netcard_by_name_or_null(lua_tostring(L, -1));
+  name = lua_tostring(L, -1);
+  ASroute.gw_dst = sg_netcard_by_name_or_null(name);
+  if (ASroute.gw_dst == NULL) {
+    XBT_ERROR("Attribute 'gw_dst' of AS route does not name a valid machine: %s", name);
+    return -1;
+  }
   lua_pop(L, 1);
 
-  /*if (A_surfxml_ASroute_gw___src && !ASroute.gw_src)*/
-    /*surf_parse_error("gw_src=\"%s\" not found for ASroute from \"%s\" to \"%s\"",*/
-                     /*A_surfxml_ASroute_gw___src, ASroute.src, ASroute.dst);*/
-  /*if (A_surfxml_ASroute_gw___dst && !ASroute.gw_dst)*/
-    /*surf_parse_error("gw_dst=\"%s\" not found for ASroute from \"%s\" to \"%s\"",*/
-                     /*A_surfxml_ASroute_gw___dst, ASroute.src, ASroute.dst);*/
-
   lua_pushstring(L,"links");
   lua_gettable(L,-2);
   ASroute.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
@@ -474,9 +443,8 @@ int console_add_ASroute(lua_State *L) {
   lua_gettable(L,-2);
   if (lua_isstring(L, -1)) {
     const char* value = lua_tostring(L, -1);
-    if (strcmp("YES", value) == 0) {
+    if (strcmp("YES", value) == 0)
       ASroute.symmetrical = TRUE;
-    }
     else
       ASroute.symmetrical = FALSE;
   }