#include <lauxlib.h>
}
-#include <simgrid/host.h>
#include "src/surf/surf_private.h"
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <simgrid/host.h>
+#include <string>
+#include <vector>
XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
}
int console_add_backbone(lua_State *L) {
- s_sg_platf_link_cbarg_t link;
- memset(&link,0,sizeof(link));
- int type;
+ LinkCreationArgs link;
link.properties = nullptr;
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);
+ int type = lua_gettable(L, -2);
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);
type = lua_gettable(L, -2);
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);
+ link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of backbone", link.id.c_str());
lua_pop(L, 1);
lua_pushstring(L, "lat");
type = lua_gettable(L, -2);
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);
+ link.latency = surf_parse_get_time(lua_tostring(L, -1), "latency of backbone", link.id.c_str());
lua_pop(L, 1);
lua_pushstring(L, "sharing_policy");
}
sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id));
+ routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str()));
return 0;
}
}
int console_add_link(lua_State *L) {
- s_sg_platf_link_cbarg_t link;
- memset(&link,0,sizeof(link));
+ LinkCreationArgs link;
- int type;
const char* policy;
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);
+ int type = lua_gettable(L, -2);
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);
if (type == LUA_TNUMBER)
link.bandwidth = lua_tonumber(L, -1);
else // LUA_TSTRING
- link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1),"bandwidth of link", link.id);
+ link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str());
lua_pop(L, 1);
//get latency value
if (type == LUA_TNUMBER)
link.latency = lua_tonumber(L, -1);
else // LUA_TSTRING
- link.latency = surf_parse_get_time(lua_tostring(L, -1),"latency of link", link.id);
+ link.latency = surf_parse_get_time(lua_tostring(L, -1), "latency of link", link.id.c_str());
lua_pop(L, 1);
/*Optional Arguments */
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);
-
lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments");
lua_pushstring(L,"src");
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*>();
- xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
- if (xbt_dynar_is_empty(names)) {
+ 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)));
} else {
// Several names separated by , \t\r\n
- unsigned int cpt;
- char *name;
- xbt_dynar_foreach(names, cpt, name) {
- if (strlen(name)>0) {
- simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
+ for (auto name : names) {
+ if (name.length() > 0) {
+ simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str());
route.link_list->push_back(link);
}
}
route.gw_dst = nullptr;
sg_platf_new_route(&route);
+ delete route.link_list;
return 0;
}
lua_pushstring(L,"links");
lua_gettable(L,-2);
ASroute.link_list = new std::vector<simgrid::surf::LinkImpl*>();
- xbt_dynar_t names = xbt_str_split(lua_tostring(L, -1), ", \t\r\n");
- if (xbt_dynar_is_empty(names)) {
+ 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)));
} else {
// Several names separated by , \t\r\n
- unsigned int cpt;
- char *name;
- xbt_dynar_foreach(names, cpt, name) {
- if (strlen(name)>0) {
- simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
+ for (auto name : names) {
+ if (name.length() > 0) {
+ simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str());
ASroute.link_list->push_back(link);
}
}
lua_pop(L,1);
sg_platf_new_route(&ASroute);
+ delete ASroute.link_list;
return 0;
}
