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, "lat");
- lua_gettable(L, -2);
+ 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);
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);
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)) {
// 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);
// 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;
s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
+ int type;
const char* policy;
if (! lua_istable(L, -1)) {
// 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, "lat");
- lua_gettable(L, -2);
+ 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);
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");
}
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);
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)));
int console_AS_open(lua_State *L) {
const char *id;
const char *mode;
+ int type;
XBT_DEBUG("Opening AS");
}
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);