X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af8dbc965fd8a420205d29aa50867ecbd0e45d33..75644e3a19490173dea3cb8ac8720f6e1840a51b:/src/bindings/lua/lua_platf.c

diff --git a/src/bindings/lua/lua_platf.c b/src/bindings/lua/lua_platf.c
index 1b7d143701..98bbb2977e 100644
--- a/src/bindings/lua/lua_platf.c
+++ b/src/bindings/lua/lua_platf.c
@@ -79,26 +79,52 @@ int console_close(lua_State *L) {
 int console_add_backbone(lua_State *L) {
   s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
+  int type;
 
   link.properties = NULL;
 
+  if (!lua_istable(L, -1)) {
+    XBT_ERROR
+        ("Bad Arguments to create backbone in Lua. Should be a table with named arguments.");
+    return -1;
+  }
+
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for backbone and must be a string.");
+  }
   link.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "bandwidth");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'bandwidth' must be specified for backbone and must either be a string (in the right format; see docs) or a number.");
+  }
   link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  lua_pushstring(L, "latency");
-  lua_gettable(L, -2);
+  lua_pushstring(L, "lat");
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'lat' must be specified for backbone and must either be a string (in the right format; see docs) or a number.");
+  }
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   link.state = SURF_RESOURCE_ON;
-  link.policy = SURF_LINK_SHARED;
+
+  lua_pushstring(L, "sharing_policy");
+  type = lua_gettable(L, -2);
+  const char* policy = lua_tostring(L, -1);
+  if (policy && !strcmp(policy,"FULLDUPLEX")) {
+    link.policy = SURF_LINK_FULLDUPLEX;
+  } else if (policy && !strcmp(policy,"FATPIPE")) {
+    link.policy = SURF_LINK_FATPIPE;
+  } else {
+    link.policy = SURF_LINK_SHARED;
+  }
 
   sg_platf_new_link(&link);
   routing_cluster_add_backbone(xbt_lib_get_or_null(link_lib, link.id, SURF_LINK_LEVEL));
@@ -109,26 +135,36 @@ int console_add_backbone(lua_State *L) {
 int console_add_host___link(lua_State *L) {
   s_sg_platf_host_link_cbarg_t host_link;
   memset(&host_link,0,sizeof(host_link));
+  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");
+        ("Bad Arguments to create host_link in Lua. Should be a table with named arguments.");
     return -1;
   }
 
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any host_link and must be a string.");
+  }
   host_link.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "up");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'up' must be specified for host_link and must either be a string or a number.");
+  }
   host_link.link_up = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   lua_pushstring(L, "down");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'down' must be specified for host_link and must either be a string or a number.");
+  }
   host_link.link_down = lua_tostring(L, -1);
   lua_pop(L, 1);
 
@@ -141,7 +177,7 @@ 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;
+  int state, type;
 
   // we get values from the table passed as argument
   if (!lua_istable(L, -1)) {
@@ -152,13 +188,19 @@ int console_add_host(lua_State *L) {
 
   // get Id Value
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'id' must be specified for any host and must be a string.");
+  }
   host.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   // get power value
   lua_pushstring(L, "power");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'power' must be specified for host and must either be a string (in the correct format; check documentation) or a number.");
+  }
   host.power_peak = xbt_dynar_new(sizeof(double), NULL);
   xbt_dynar_push_as(host.power_peak, double, get_cpu_power(lua_tostring(L, -1)));
   lua_pop(L, 1);
@@ -166,27 +208,29 @@ int console_add_host(lua_State *L) {
   // get core
   lua_pushstring(L, "core");
   lua_gettable(L, -2);
-  if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value
+  if(!lua_isnumber(L,-1)) {
+      host.core_amount = 1;// Default value
+  }
   else host.core_amount = lua_tonumber(L, -1);
   if (host.core_amount == 0)
     host.core_amount = 1;
   lua_pop(L, 1);
 
   //get power_scale
-  lua_pushstring(L, "power_scale");
+  lua_pushstring(L, "availability");
   lua_gettable(L, -2);
   if(!lua_isnumber(L,-1)) host.power_scale = 1;// Default value
   else host.power_scale = lua_tonumber(L, -1);
   lua_pop(L, 1);
 
   //get power_trace
-  lua_pushstring(L, "power_trace");
+  lua_pushstring(L, "availability_file");
   lua_gettable(L, -2);
   host.power_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state initial
-  lua_pushstring(L, "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);
@@ -198,7 +242,7 @@ int console_add_host(lua_State *L) {
     host.initial_state = SURF_RESOURCE_OFF;
 
   //get trace state
-  lua_pushstring(L, "state_trace");
+  lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
   host.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
@@ -212,6 +256,7 @@ int  console_add_link(lua_State *L) {
   s_sg_platf_link_cbarg_t link;
   memset(&link,0,sizeof(link));
 
+  int type;
   const char* policy;
 
   if (! lua_istable(L, -1)) {
@@ -221,44 +266,53 @@ int  console_add_link(lua_State *L) {
 
   // get Id Value
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'id' must be specified for any link and must be a string.");
+  }
   link.id = lua_tostring(L, -1);
   lua_pop(L, 1);
 
   // get bandwidth value
   lua_pushstring(L, "bandwidth");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number.");
+  }
   link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get latency value
-  lua_pushstring(L, "latency");
-  lua_gettable(L, -2);
+  lua_pushstring(L, "lat");
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING && type != LUA_TNUMBER) {
+    XBT_ERROR("Attribute 'lat' must be specified for any link and must either be a string (in the right format; see docs) or a number.");
+  }
   link.latency = surf_parse_get_time(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   /*Optional Arguments  */
 
   //get bandwidth_trace value
-  lua_pushstring(L, "bandwidth_trace");
+  lua_pushstring(L, "bandwidth_file");
   lua_gettable(L, -2);
   link.bandwidth_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get latency_trace value
-  lua_pushstring(L, "latency_trace");
+  lua_pushstring(L, "latency_file");
   lua_gettable(L, -2);
   link.latency_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state_trace value
-  lua_pushstring(L, "state_trace");
+  lua_pushstring(L, "state_file");
   lua_gettable(L, -2);
   link.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1));
   lua_pop(L, 1);
 
   //get state_initial value
-  lua_pushstring(L, "state_initial");
+  lua_pushstring(L, "state");
   lua_gettable(L, -2);
   if (!lua_isnumber(L,-1) || lua_tonumber(L, -1))
     link.state = SURF_RESOURCE_ON;
@@ -267,7 +321,7 @@ int  console_add_link(lua_State *L) {
   lua_pop(L, 1);
 
   //get policy value
-  lua_pushstring(L, "policy");
+  lua_pushstring(L, "sharing_policy");
   lua_gettable(L, -2);
   policy = lua_tostring(L, -1);
   lua_pop(L, 1);
@@ -289,6 +343,7 @@ int  console_add_link(lua_State *L) {
 int console_add_router(lua_State* L) {
   s_sg_platf_router_cbarg_t router;
   memset(&router,0,sizeof(router));
+  int type;
 
   if (! lua_istable(L, -1)) {
     XBT_ERROR("Bad Arguments to create router, Should be a table with named arguments");
@@ -296,7 +351,10 @@ int console_add_router(lua_State* L) {
   }
 
   lua_pushstring(L, "id");
-  lua_gettable(L, -2);
+  type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any link and must be a string.");
+  }
   router.id = lua_tostring(L, -1);
   lua_pop(L,1);
 
@@ -316,27 +374,37 @@ int console_add_route(lua_State *L) {
   XBT_DEBUG("Adding route");
   s_sg_platf_route_cbarg_t route;
   memset(&route,0,sizeof(route));
+  int type;
 
   /* allocating memory for the buffer, I think 2kB should be enough */
   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 create a route. Should be a table with named arguments");
     return -1;
   }
 
   lua_pushstring(L,"src");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'src' must be specified for any route and must be a string.");
+  }
   route.src = lua_tostring(L, -1);
   lua_pop(L,1);
 
   lua_pushstring(L,"dest");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'dest' must be specified for any route and must be a string.");
+  }
   route.dst = lua_tostring(L, -1);
   lua_pop(L,1);
 
   lua_pushstring(L,"links");
-  lua_gettable(L,-2);
+  type = lua_gettable(L,-2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'links' must be specified for any route and must be a string (different links separated by commas or single spaces.");
+  }
   route.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
   if (xbt_dynar_is_empty(route.link_list))
     xbt_dynar_push_as(route.link_list,char*,xbt_strdup(lua_tostring(L, -1)));
@@ -432,6 +500,7 @@ int console_add_ASroute(lua_State *L) {
 int console_AS_open(lua_State *L) {
  const char *id;
  const char *mode;
+ int type;
 
  XBT_DEBUG("Opening AS");
 
@@ -441,7 +510,10 @@ int console_AS_open(lua_State *L) {
  }
 
  lua_pushstring(L, "id");
- lua_gettable(L, -2);
+ type = lua_gettable(L, -2);
+  if (type != LUA_TSTRING) {
+    XBT_ERROR("Attribute 'id' must be specified for any AS and must be a string.");
+  }
  id = lua_tostring(L, -1);
  lua_pop(L, 1);