/* 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 <string.h>
#include <ctype.h>
#include <simgrid/host.h>
#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"
{"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},
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);
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;
}
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);
+ 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
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;
}
//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
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;
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)));
+ route.link_list = new std::vector<Link*>();
+ 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);
+ }
+ }
+ }
lua_pop(L,1);
/* We are relying on the XML bypassing mechanism since the corresponding sg_platf does not exist yet.
if (lua_isstring(L, -1)) {
const char* value = lua_tostring(L, -1);
if (strcmp("YES", value) == 0) {
- route.symmetrical = TRUE;
+ route.symmetrical = true;
}
else
- route.symmetrical = FALSE;
+ route.symmetrical = false;
}
else {
- route.symmetrical = TRUE;
+ route.symmetrical = true;
}
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<Link*>();
+ xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
+ if (xbt_dynar_is_empty(names)) {
+ /* unique name */
+ 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");
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);
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;
-
sg_platf_new_AS_begin(&AS);
return 0;
}
-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;
}
