-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. 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. */
/* SimGrid Lua bindings */
#include "lua_private.h"
-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
-#include "surf/surf_routing.h"
-#include <string.h>
-#include <ctype.h>
+#include "src/surf/xml/platf_private.hpp"
+#include <cctype>
+#include <cstring>
extern "C" {
#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/s4u/Host.hpp>
+#include <string>
+#include <vector>
XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
sg_platf_begin();
storage_register_callbacks();
- routing_register_callbacks();
return 0;
}
}
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");
type = lua_gettable(L, -2);
const char* policy = lua_tostring(L, -1);
- if (policy && !strcmp(policy,"FULLDUPLEX")) {
+ if (policy && not strcmp(policy, "FULLDUPLEX")) {
link.policy = SURF_LINK_FULLDUPLEX;
- } else if (policy && !strcmp(policy,"FATPIPE")) {
+ } else if (policy && not strcmp(policy, "FATPIPE")) {
link.policy = SURF_LINK_FATPIPE;
} else {
link.policy = SURF_LINK_SHARED;
}
sg_platf_new_link(&link);
- routing_cluster_add_backbone(sg_link_by_name(link.id));
+ routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id));
return 0;
}
// get core
lua_pushstring(L, "core");
lua_gettable(L, -2);
- if(!lua_isnumber(L,-1))
- host.core_amount = 1;// Default value
+ if (not lua_isnumber(L, -1))
+ host.core_amount = 1; // Default value
else
host.core_amount = lua_tonumber(L, -1);
if (host.core_amount == 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 */
lua_gettable(L, -2);
policy = lua_tostring(L, -1);
lua_pop(L, 1);
- if (policy && !strcmp(policy,"FULLDUPLEX")) {
+ if (policy && not strcmp(policy, "FULLDUPLEX")) {
link.policy = SURF_LINK_FULLDUPLEX;
- } else if (policy && !strcmp(policy,"FATPIPE")) {
+ } else if (policy && not strcmp(policy, "FATPIPE")) {
link.policy = SURF_LINK_FATPIPE;
} else {
link.policy = SURF_LINK_SHARED;
* add Router to AS components
*/
int console_add_router(lua_State* L) {
- s_sg_platf_router_cbarg_t router;
- memset(&router,0,sizeof(router));
- int type;
-
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);
+ int type = lua_gettable(L, -2);
lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any link and must be a string.");
- router.id = lua_tostring(L, -1);
+ const char* name = lua_tostring(L, -1);
lua_pop(L,1);
lua_pushstring(L,"coord");
lua_gettable(L,-2);
- router.coord = lua_tostring(L, -1);
+ const char* coords = lua_tostring(L, -1);
lua_pop(L,1);
- sg_platf_new_router(&router);
+ sg_platf_new_router(name, coords);
return 0;
}
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");
type = lua_gettable(L,-2);
lua_ensure(type == LUA_TSTRING, "Attribute 'src' must be specified for any route and must be a string.");
const char *srcName = lua_tostring(L, -1);
- route.src = sg_netcard_by_name_or_null(srcName);
+ route.src = sg_netpoint_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);
type = lua_gettable(L,-2);
lua_ensure(type == LUA_TSTRING, "Attribute 'dest' must be specified for any route and must be a string.");
const char *dstName = lua_tostring(L, -1);
- route.dst = sg_netcard_by_name_or_null(dstName);
+ route.dst = sg_netpoint_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);
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)) {
+ 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(Link::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
- unsigned int cpt;
- char *name;
- xbt_dynar_foreach(names, cpt, name) {
- if (strlen(name)>0) {
- Link *link = Link::byName(name);
+ for (auto name : names) {
+ if (name.length() > 0) {
+ simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
route.link_list->push_back(link);
}
}
route.gw_dst = nullptr;
sg_platf_new_route(&route);
+ delete route.link_list;
return 0;
}
lua_pushstring(L, "src");
lua_gettable(L, -2);
const char *srcName = lua_tostring(L, -1);
- ASroute.src = sg_netcard_by_name_or_null(srcName);
+ ASroute.src = sg_netpoint_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);
const char *dstName = lua_tostring(L, -1);
- ASroute.dst = sg_netcard_by_name_or_null(dstName);
+ ASroute.dst = sg_netpoint_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);
+ ASroute.gw_src = sg_netpoint_by_name_or_null(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);
+ ASroute.gw_dst = sg_netpoint_by_name_or_null(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)) {
+ 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(Link::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
- unsigned int cpt;
- char *name;
- xbt_dynar_foreach(names, cpt, name) {
- if (strlen(name)>0) {
- Link *link = Link::byName(name);
+ for (auto name : names) {
+ if (name.length() > 0) {
+ simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
ASroute.link_list->push_back(link);
}
}
lua_pop(L,1);
sg_platf_new_route(&ASroute);
+ delete ASroute.link_list;
return 0;
}
int console_AS_open(lua_State *L) {
- const char *id;
- const char *mode;
- int type;
-
XBT_DEBUG("Opening AS");
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);
+ int type = lua_gettable(L, -2);
lua_ensure(type == LUA_TSTRING, "Attribute 'id' must be specified for any AS and must be a string.");
- id = lua_tostring(L, -1);
+ const char* id = lua_tostring(L, -1);
lua_pop(L, 1);
lua_pushstring(L, "mode");
lua_gettable(L, -2);
- mode = lua_tostring(L, -1);
+ const char* mode = lua_tostring(L, -1);
lua_pop(L, 1);
int mode_int = A_surfxml_AS_routing_None;
- if(!strcmp(mode,"Full")) mode_int = A_surfxml_AS_routing_Full;
- else if(!strcmp(mode,"Floyd")) mode_int = A_surfxml_AS_routing_Floyd;
- else if(!strcmp(mode,"Dijkstra")) mode_int = A_surfxml_AS_routing_Dijkstra;
- else if(!strcmp(mode,"DijkstraCache")) mode_int = A_surfxml_AS_routing_DijkstraCache;
- else if(!strcmp(mode,"Vivaldi")) mode_int = A_surfxml_AS_routing_Vivaldi;
- else if(!strcmp(mode,"Cluster")) mode_int = A_surfxml_AS_routing_Cluster;
- else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None;
+ if (not strcmp(mode, "Full"))
+ mode_int = A_surfxml_AS_routing_Full;
+ else if (not strcmp(mode, "Floyd"))
+ mode_int = A_surfxml_AS_routing_Floyd;
+ else if (not strcmp(mode, "Dijkstra"))
+ mode_int = A_surfxml_AS_routing_Dijkstra;
+ else if (not strcmp(mode, "DijkstraCache"))
+ mode_int = A_surfxml_AS_routing_DijkstraCache;
+ else if (not strcmp(mode, "Vivaldi"))
+ mode_int = A_surfxml_AS_routing_Vivaldi;
+ else if (not strcmp(mode, "Cluster"))
+ mode_int = A_surfxml_AS_routing_Cluster;
+ else if (not 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;
+ ZoneCreationArgs AS;
AS.id = id;
AS.routing = mode_int;
- simgrid::s4u::As *new_as = sg_platf_new_AS_begin(&AS);
+ simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_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 */
+ simgrid::s4u::NetZone** lua_as =
+ (simgrid::s4u::NetZone**)lua_newuserdata(L, sizeof(simgrid::s4u::NetZone*)); /* table userdatum */
*lua_as = new_as;
luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
lua_setmetatable(L, -2); /* table userdatum */
}
int console_AS_seal(lua_State *L) {
XBT_DEBUG("Sealing AS");
- sg_platf_new_AS_seal();
+ sg_platf_new_Zone_seal();
return 0;
}
int console_host_set_property(lua_State *L) {
- const char* name ="";
- const char* prop_id = "";
- const char* prop_value = "";
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");
lua_gettable(L, -2);
- name = lua_tostring(L, -1);
+ const char* name = lua_tostring(L, -1);
lua_pop(L, 1);
// get prop Name
lua_pushstring(L, "prop");
lua_gettable(L, -2);
- prop_id = lua_tostring(L, -1);
+ const char* prop_id = lua_tostring(L, -1);
lua_pop(L, 1);
//get args
lua_pushstring(L,"value");
lua_gettable(L, -2);
- prop_value = lua_tostring(L,-1);
+ const char* prop_value = lua_tostring(L, -1);
lua_pop(L, 1);
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),nullptr);
+ host->setProperty(prop_id, prop_value);
return 0;
}
