A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix lua builds, as a courtesy to frs69wq :)
[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
7775b95
..
fc3b0a8
100644
(file)
--- a/
src/bindings/lua/lua_platf.cpp
+++ b/
src/bindings/lua/lua_platf.cpp
@@
-41,7
+41,7
@@
static const luaL_Reg platf_functions[] = {
{"router_new", console_add_router},
{"route_new", console_add_route},
{"ASroute_new", console_add_ASroute},
- {
NULL, NULL
}
+ {
nullptr, nullptr
}
};
int console_open(lua_State *L) {
@@
-65,7
+65,7
@@
int console_add_backbone(lua_State *L) {
memset(&link,0,sizeof(link));
int type;
- link.properties =
NULL
;
+ link.properties =
nullptr
;
lua_ensure(lua_istable(L, -1),"Bad Arguments to create backbone in Lua. Should be a table with named arguments.");
@@
-162,11
+162,10
@@
int console_add_host(lua_State *L) {
type = lua_gettable(L, -2);
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_per_pstate, double,
lua_tointeger(L, -1));
+
host.speed_per_pstate->push_back(
lua_tointeger(L, -1));
else // LUA_TSTRING
-
xbt_dynar_push_as(host.speed_per_pstate, double,
surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));
+
host.speed_per_pstate->push_back(
surf_parse_get_speed(lua_tostring(L, -1), "speed of host", host.id));
lua_pop(L, 1);
// get core
@@
-197,7
+196,6
@@
int console_add_host(lua_State *L) {
lua_pop(L, 1);
sg_platf_new_host(&host);
- xbt_dynar_free(&host.speed_per_pstate);
return 0;
}
@@
-325,23
+323,28
@@
int console_add_route(lua_State *L) {
lua_pushstring(L,"src");
type = lua_gettable(L,-2);
lua_ensure(type == LUA_TSTRING, "Attribute 'src' must be specified for any route and must be a string.");
- route.src = lua_tostring(L, -1);
+ const char *srcName = lua_tostring(L, -1);
+ route.src = sg_netcard_by_name_or_null(srcName);
+ lua_ensure(route.src != nullptr, "Attribute 'src=%s' of route does not name a node.", srcName);
lua_pop(L,1);
lua_pushstring(L,"dest");
type = lua_gettable(L,-2);
lua_ensure(type == LUA_TSTRING, "Attribute 'dest' must be specified for any route and must be a string.");
- route.dst = lua_tostring(L, -1);
+ const char *dstName = lua_tostring(L, -1);
+ route.dst = sg_netcard_by_name_or_null(dstName);
+ lua_ensure(route.dst != nullptr, "Attribute 'dst=%s' of route does not name a node.", dstName);
lua_pop(L,1);
lua_pushstring(L,"links");
type = lua_gettable(L,-2);
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<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)));
+ route.link_list
->
push_back(Link::byName(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
unsigned int cpt;
@@
-349,7
+352,7
@@
int console_add_route(lua_State *L) {
xbt_dynar_foreach(names, cpt, name) {
if (strlen(name)>0) {
Link *link = Link::byName(name);
- route.link_list
.
push_back(link);
+ route.link_list
->
push_back(link);
}
}
}
@@
-375,8
+378,8
@@
int console_add_route(lua_State *L) {
}
lua_pop(L,1);
- route.gw_src =
NULL
;
- route.gw_dst =
NULL
;
+ route.gw_src =
nullptr
;
+ route.gw_dst =
nullptr
;
sg_platf_new_route(&route);
@@
-389,34
+392,39
@@
int console_add_ASroute(lua_State *L) {
lua_pushstring(L, "src");
lua_gettable(L, -2);
- ASroute.src = lua_tostring(L, -1);
+ const char *srcName = lua_tostring(L, -1);
+ ASroute.src = sg_netcard_by_name_or_null(srcName);
+ lua_ensure(ASroute.src != nullptr, "Attribute 'src=%s' of AS route does not name a node.", srcName);
lua_pop(L, 1);
lua_pushstring(L, "dst");
lua_gettable(L, -2);
- ASroute.dst = lua_tostring(L, -1);
+ const char *dstName = lua_tostring(L, -1);
+ ASroute.dst = sg_netcard_by_name_or_null(dstName);
+ lua_ensure(ASroute.dst != nullptr, "Attribute 'dst=%s' of AS route does not name a node.", dstName);
lua_pop(L, 1);
lua_pushstring(L, "gw_src");
lua_gettable(L, -2);
const char *name = lua_tostring(L, -1);
ASroute.gw_src = sg_netcard_by_name_or_null(name);
- lua_ensure(ASroute.gw_src, "Attribute 'gw_src
' of AS route does not name a valid machine: %s
", name);
+ lua_ensure(ASroute.gw_src, "Attribute 'gw_src
=%s' of AS route does not name a valid node
", 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);
- lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst
' of AS route does not name a valid machine: %s
", name);
+ lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst
=%s' of AS route does not name a valid node
", name);
lua_pop(L, 1);
lua_pushstring(L,"links");
lua_gettable(L,-2);
+ 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 with no comma */
- ASroute.link_list
.
push_back(Link::byName(lua_tostring(L, -1)));
+ ASroute.link_list
->
push_back(Link::byName(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
unsigned int cpt;
@@
-424,7
+432,7
@@
int console_add_ASroute(lua_State *L) {
xbt_dynar_foreach(names, cpt, name) {
if (strlen(name)>0) {
Link *link = Link::byName(name);
- ASroute.link_list
.
push_back(link);
+ ASroute.link_list
->
push_back(link);
}
}
}
@@
-526,7
+534,7
@@
int console_host_set_property(lua_State *L) {
sg_host_t host = sg_host_by_name(name);
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
);
+ xbt_dict_set(props,prop_id,xbt_strdup(prop_value),
nullptr
);
return 0;
}
@@
-539,7
+547,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); /* -- */
}