X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..b082c54b2467c9ec060d956dee6c4f688d50e4c4:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 18ae0e2394..bc870a619f 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -7,8 +7,8 @@ /* SimGrid Lua bindings */ #include "lua_private.h" -#include "simgrid/platf_interface.h" -#include "surf/surfxml_parse.h" +#include "src/surf/xml/platf_private.hpp" +#include "src/surf/network_interface.hpp" #include "surf/surf_routing.h" #include #include @@ -20,9 +20,10 @@ extern "C" { #include #include "src/surf/surf_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua_platf, bindings, "Lua bindings (platform module)"); +XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)"); -#define PLATF_MODULE_NAME "simgrid.platf" +#define PLATF_MODULE_NAME "simgrid.engine" +#define AS_FIELDNAME "__simgrid_as" /* ********************************************************************************* */ /* simgrid.platf API */ @@ -32,7 +33,7 @@ static const luaL_Reg platf_functions[] = { {"open", console_open}, {"close", console_close}, {"AS_open", console_AS_open}, - {"AS_close", console_AS_close}, + {"AS_seal", console_AS_seal}, {"backbone_new", console_add_backbone}, {"host_link_new", console_add_host___link}, {"host_new", console_add_host}, @@ -66,38 +67,28 @@ int console_add_backbone(lua_State *L) { 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_ensure(lua_istable(L, -1),"Bad Arguments to create backbone in Lua. Should be a table with named arguments."); lua_pushstring(L, "id"); type = lua_gettable(L, -2); - if (type != LUA_TSTRING) { - XBT_ERROR("Attribute 'id' must be specified for backbone and must be a string."); - } + lua_ensure(type == LUA_TSTRING, "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"); 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."); - } + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "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),"bandwidth of backbone",link.id); lua_pop(L, 1); 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."); - } + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "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),"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); @@ -116,43 +107,35 @@ int console_add_backbone(lua_State *L) { } int console_add_host___link(lua_State *L) { - s_sg_platf_host_link_cbarg_t netcard; - memset(&netcard,0,sizeof(netcard)); + s_sg_platf_host_link_cbarg_t hostlink; + memset(&hostlink,0,sizeof(hostlink)); int type; - // we get values from the table passed as argument - if (!lua_istable(L, -1)) { - XBT_ERROR - ("Bad Arguments to create host_link in Lua. Should be a table with named arguments."); - return -1; - } + lua_ensure(lua_istable(L, -1), + "Bad Arguments to create host_link in Lua. Should be a table with named arguments."); lua_pushstring(L, "id"); 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."); - } - netcard.id = lua_tostring(L, -1); + lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any host_link and must be a string."); + hostlink.id = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "up"); 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."); - } - netcard.link_up = lua_tostring(L, -1); + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "Attribute 'up' must be specified for host_link and must either be a string or a number."); + hostlink.link_up = lua_tostring(L, -1); lua_pop(L, 1); lua_pushstring(L, "down"); 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."); - } - netcard.link_down = lua_tostring(L, -1); + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "Attribute 'down' must be specified for host_link and must either be a string or a number."); + hostlink.link_down = lua_tostring(L, -1); lua_pop(L, 1); - XBT_DEBUG("Create a host_link for host %s", netcard.id); - sg_platf_new_hostlink(&netcard); + XBT_DEBUG("Create a host_link for host %s", hostlink.id); + sg_platf_new_hostlink(&hostlink); return 0; } @@ -160,81 +143,61 @@ 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"); - return -1; - } + lua_ensure(lua_istable(L, -1), + "Bad Arguments to create host. Should be a table with named arguments"); // get Id Value lua_pushstring(L, "id"); type = lua_gettable(L, -2); - if (type != LUA_TSTRING) { - XBT_ERROR("Attribute 'id' must be specified for any host and must be a string."); - } + lua_ensure(type == LUA_TSTRING, + "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, "speed"); type = lua_gettable(L, -2); - if (type != LUA_TSTRING && type != LUA_TNUMBER) { - XBT_ERROR("Attribute 'speed' must be specified for host and must either be a string (in the correct format; check documentation) or a number."); - } - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); + 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), NULL); if (type == LUA_TNUMBER) - xbt_dynar_push_as(host.speed_peak, double, lua_tointeger(L, -1)); + xbt_dynar_push_as(host.speed_per_pstate, double, lua_tointeger(L, -1)); else // LUA_TSTRING - xbt_dynar_push_as(host.speed_peak, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id)); + xbt_dynar_push_as(host.speed_per_pstate, double, surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id)); lua_pop(L, 1); // get core lua_pushstring(L, "core"); lua_gettable(L, -2); - if(!lua_isnumber(L,-1)) { + if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value - } - else host.core_amount = lua_tonumber(L, -1); + 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, "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)); + const char *filename = lua_tostring(L, -1); + if (filename) + host.speed_trace = tmgr_trace_new_from_file(filename); 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); - host.state_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); + filename = lua_tostring(L, -1); + if (filename) + host.state_trace = tmgr_trace_new_from_file(filename); lua_pop(L, 1); sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_peak); + xbt_dynar_free(&host.speed_per_pstate); return 0; } @@ -246,26 +209,21 @@ int console_add_link(lua_State *L) { int type; const char* policy; - if (! lua_istable(L, -1)) { - XBT_ERROR("Bad Arguments to create link, Should be a table with named arguments"); - return -1; - } + lua_ensure(lua_istable(L, -1), "Bad Arguments to create link, Should be a table with named arguments"); // get Id Value lua_pushstring(L, "id"); 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."); - } + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "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"); 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."); - } + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number."); if (type == LUA_TNUMBER) link.bandwidth = lua_tonumber(L, -1); else // LUA_TSTRING @@ -275,9 +233,8 @@ int console_add_link(lua_State *L) { //get latency value 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."); - } + lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER, + "Attribute 'lat' must be specified for any link and must either be a string (in the right format; see docs) or a number."); if (type == LUA_TNUMBER) link.latency = lua_tonumber(L, -1); else // LUA_TSTRING @@ -289,28 +246,25 @@ int console_add_link(lua_State *L) { //get bandwidth_trace value lua_pushstring(L, "bandwidth_file"); lua_gettable(L, -2); - link.bandwidth_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); + const char *filename = lua_tostring(L, -1); + if (filename) + link.bandwidth_trace = tmgr_trace_new_from_file(filename); lua_pop(L, 1); //get latency_trace value lua_pushstring(L, "latency_file"); lua_gettable(L, -2); - link.latency_trace = tmgr_trace_new_from_file(lua_tostring(L, -1)); + filename = lua_tostring(L, -1); + if (filename) + link.latency_trace = tmgr_trace_new_from_file(filename); lua_pop(L, 1); //get state_trace value 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"); - lua_gettable(L, -2); - if (!lua_isnumber(L,-1) || lua_tonumber(L, -1)) - link.initiallyOn = 1; - else - link.initiallyOn = 0; + filename = lua_tostring(L, -1); + if (filename) + link.state_trace = tmgr_trace_new_from_file(filename); lua_pop(L, 1); //get policy value @@ -338,16 +292,12 @@ int console_add_router(lua_State* L) { 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"); - return -1; - } + 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); - if (type != LUA_TSTRING) { - XBT_ERROR("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); lua_pop(L,1); @@ -361,8 +311,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; @@ -372,35 +320,40 @@ int console_add_route(lua_State *L) { /* 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 add a route. Should be a table with named arguments"); - return -1; - } + lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments"); lua_pushstring(L,"src"); type = lua_gettable(L,-2); - if (type != LUA_TSTRING) { - XBT_ERROR("Attribute 'src' must be specified for any route and must be a string."); - } + lua_ensure(type == LUA_TSTRING, "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"); type = lua_gettable(L,-2); - if (type != LUA_TSTRING) { - XBT_ERROR("Attribute 'dest' must be specified for any route and must be a string."); - } + lua_ensure(type == LUA_TSTRING, "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"); 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."); + lua_ensure(type == LUA_TSTRING, + "Attribute 'links' must be specified for any route and must be a string (different links separated by commas or single spaces."); + route.link_list = new std::vector(); + xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); + if (xbt_dynar_is_empty(names)) { + /* unique name */ + route.link_list->push_back(Link::byName(lua_tostring(L, -1))); + } else { + // Several names separated by , \t\r\n + unsigned int cpt; + char *name; + xbt_dynar_foreach(names, cpt, name) { + if (strlen(name)>0) { + Link *link = Link::byName(name); + route.link_list->push_back(link); + } + } } - 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))); lua_pop(L,1); /* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet. @@ -413,14 +366,13 @@ int console_add_route(lua_State *L) { lua_gettable(L,-2); if (lua_isstring(L, -1)) { const char* value = lua_tostring(L, -1); - if (strcmp("YES", value) == 0) { - route.symmetrical = TRUE; - } + if (strcmp("YES", value) == 0) + route.symmetrical = true; else - route.symmetrical = FALSE; + route.symmetrical = false; } else { - route.symmetrical = TRUE; + route.symmetrical = true; } lua_pop(L,1); @@ -450,27 +402,34 @@ int console_add_ASroute(lua_State *L) { lua_gettable(L, -2); 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_ensure(ASroute.gw_src, "Attribute 'gw_src' of AS route does not name a valid machine: %s", 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); - if (ASroute.gw_dst == NULL) { - XBT_ERROR("Attribute 'gw_dst' of AS route does not name a valid machine: %s", name); - return -1; - } + lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst' of AS route does not name a valid machine: %s", name); lua_pop(L, 1); lua_pushstring(L,"links"); lua_gettable(L,-2); - ASroute.link_list = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); - if (xbt_dynar_is_empty(ASroute.link_list)) - xbt_dynar_push_as(ASroute.link_list,char*,xbt_strdup(lua_tostring(L, -1))); + ASroute.link_list = new std::vector(); + xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n"); + if (xbt_dynar_is_empty(names)) { + /* unique name with no comma */ + ASroute.link_list->push_back(Link::byName(lua_tostring(L, -1))); + } else { + // Several names separated by , \t\r\n + unsigned int cpt; + char *name; + xbt_dynar_foreach(names, cpt, name) { + if (strlen(name)>0) { + Link *link = Link::byName(name); + ASroute.link_list->push_back(link); + } + } + } lua_pop(L,1); lua_pushstring(L,"symmetrical"); @@ -478,12 +437,12 @@ int console_add_ASroute(lua_State *L) { if (lua_isstring(L, -1)) { const char* value = lua_tostring(L, -1); if (strcmp("YES", value) == 0) - ASroute.symmetrical = TRUE; + ASroute.symmetrical = true; else - ASroute.symmetrical = FALSE; + ASroute.symmetrical = false; } else { - ASroute.symmetrical = TRUE; + ASroute.symmetrical = true; } lua_pop(L,1); @@ -499,16 +458,11 @@ int console_AS_open(lua_State *L) { XBT_DEBUG("Opening AS"); - if (! lua_istable(L, 1)) { - XBT_ERROR("Bad Arguments to AS_open, Should be a table with named arguments"); - return -1; - } + lua_ensure(lua_istable(L, 1), "Bad Arguments to AS_open, Should be a table with named arguments"); lua_pushstring(L, "id"); type = lua_gettable(L, -2); - if (type != LUA_TSTRING) { - XBT_ERROR("Attribute 'id' must be specified for any AS and must be a string."); - } + lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any AS and must be a string."); id = lua_tostring(L, -1); lua_pop(L, 1); @@ -527,17 +481,24 @@ int console_AS_open(lua_State *L) { else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None; else xbt_die("Don't have the model name '%s'",mode); - s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; + 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); - 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 */ + *lua_as = new_as; + luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */ + lua_setmetatable(L, -2); /* table userdatum */ + lua_setfield(L, -2, AS_FIELDNAME); /* table -- put the userdata as field of the table */ - return 0; + return 1; } -int console_AS_close(lua_State *L) { - XBT_DEBUG("Closing AS"); - sg_platf_new_AS_end(); +int console_AS_seal(lua_State *L) { + XBT_DEBUG("Sealing AS"); + sg_platf_new_AS_seal(); return 0; } @@ -545,11 +506,7 @@ int console_host_set_property(lua_State *L) { const char* name =""; const char* prop_id = ""; const char* prop_value = ""; - if (!lua_istable(L, -1)) { - XBT_ERROR("Bad Arguments to create link, Should be a table with named arguments"); - return -1; - } - + lua_ensure(lua_istable(L, -1), "Bad Arguments to create link, Should be a table with named arguments"); // get Host id lua_pushstring(L, "host"); @@ -569,10 +526,7 @@ int console_host_set_property(lua_State *L) { lua_pop(L, 1); sg_host_t host = sg_host_by_name(name); - if (!host) { - XBT_ERROR("no host '%s' found",name); - return -1; - } + lua_ensure(host, "no host '%s' found",name); xbt_dict_t props = sg_host_get_properties(host); xbt_dict_set(props,prop_id,xbt_strdup(prop_value),NULL); @@ -587,38 +541,7 @@ void sglua_register_platf_functions(lua_State* L) { lua_getglobal(L, "simgrid"); /* simgrid */ luaL_newlib(L, platf_functions); /* simgrid simgrid.platf */ - lua_setfield(L, -2, "platf"); /* simgrid */ + lua_setfield(L, -2, "engine"); /* simgrid */ lua_pop(L, 1); /* -- */ } - -//void sglua_register_routing_constants(lua_State* L) -//{ -// lua_getglobal(L, "simgrid"); /* simgrid */ -// lua_newtable(L); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "Cluster"); /* simgrid simgrid.routing Cluster */ -// lua_setfield(L, -2, "CLUSTER"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "Dijkstra"); /* simgrid simgrid.routing Dijkstra */ -// lua_setfield(L, -2, "DIJKSTRA"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "DijkstraCache"); /* simgrid simgrid.routing DijkstraCache */ -// lua_setfield(L, -2, "DIJKSTRA_CACHE"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "Floyd"); /* simgrid simgrid.routing Floyd */ -// lua_setfield(L, -2, "FLOYD"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "Full"); /* simgrid simgrid.routing Full */ -// lua_setfield(L, -2, "FULL"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "None"); /* simgrid simgrid.routing None */ -// lua_setfield(L, -2, "NONE"); /* simgrid simgrid.routing */ -// -// lua_pushstring(L, "Vivaldi"); /* simgrid simgrid.routing Vivaldi */ -// lua_setfield(L, -2, "FULL"); /* simgrid simgrid.routing */ -// -// lua_setfield(L, -2, "routing"); /* simgrid */ -// -// lua_pop(L, 1); /* -- */ -//}