-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
lua_pop(L, 1);
lua_pushstring(L, "sharing_policy");
- type = lua_gettable(L, -2);
+ lua_gettable(L, -2);
const char* policy = lua_tostring(L, -1);
+ lua_pop(L, 1);
if (policy && not strcmp(policy, "FULLDUPLEX")) {
- link.policy = SURF_LINK_FULLDUPLEX;
+ link.policy = SURF_LINK_SPLITDUPLEX;
} else if (policy && not strcmp(policy, "FATPIPE")) {
link.policy = SURF_LINK_FATPIPE;
} else {
int console_add_host(lua_State *L) {
s_sg_platf_host_cbarg_t host;
- memset(&host,0,sizeof(host));
int type;
// we get values from the table passed as argument
policy = lua_tostring(L, -1);
lua_pop(L, 1);
if (policy && not strcmp(policy, "FULLDUPLEX")) {
- link.policy = SURF_LINK_FULLDUPLEX;
+ link.policy = SURF_LINK_SPLITDUPLEX;
} else if (policy && not strcmp(policy, "FATPIPE")) {
link.policy = SURF_LINK_FATPIPE;
} else {
int console_add_route(lua_State *L) {
XBT_DEBUG("Adding route");
- s_sg_platf_route_cbarg_t route;
- memset(&route,0,sizeof(route));
+ RouteCreationArgs route;
int type;
lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments");
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<simgrid::surf::LinkImpl*>();
std::vector<std::string> names;
const char* str = lua_tostring(L, -1);
boost::split(names, str, boost::is_any_of(", \t\r\n"));
if (names.empty()) {
/* unique name */
- route.link_list->push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
+ route.link_list.push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
- route.link_list->push_back(link);
+ route.link_list.push_back(link);
}
}
}
route.gw_dst = nullptr;
sg_platf_new_route(&route);
- delete route.link_list;
return 0;
}
int console_add_ASroute(lua_State *L) {
- s_sg_platf_route_cbarg_t ASroute;
- memset(&ASroute,0,sizeof(ASroute));
+ RouteCreationArgs ASroute;
lua_pushstring(L, "src");
lua_gettable(L, -2);
lua_pushstring(L,"links");
lua_gettable(L,-2);
- ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
std::vector<std::string> names;
const char* str = lua_tostring(L, -1);
boost::split(names, str, boost::is_any_of(", \t\r\n"));
if (names.empty()) {
/* unique name with no comma */
- ASroute.link_list->push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
+ ASroute.link_list.push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
- ASroute.link_list->push_back(link);
+ ASroute.link_list.push_back(link);
}
}
}
lua_pop(L,1);
sg_platf_new_route(&ASroute);
- delete ASroute.link_list;
return 0;
}