-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. 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. */
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_private.hpp"
+#include "src/surf/xml/platf.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "xbt/parse_units.hpp"
}
int console_add_backbone(lua_State *L) {
- simgrid::kernel::routing::LinkCreationArgs link;
+ auto link = std::make_unique<simgrid::kernel::routing::LinkCreationArgs>();
lua_Debug ar;
lua_getstack(L, 1, &ar);
lua_getinfo(L, "Sl", &ar);
- 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");
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);
+ link->id = lua_tostring(L, -1);
lua_pop(L, 1);
lua_pushstring(L, "bandwidth");
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.bandwidths.push_back(xbt_parse_get_bandwidth(ar.short_src, ar.currentline, lua_tostring(L, -1),
- "bandwidth of backbone", link.id.c_str()));
+ link->bandwidths.push_back(
+ xbt_parse_get_bandwidth(ar.short_src, ar.currentline, lua_tostring(L, -1), "bandwidth of backbone " + link->id));
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 =
- xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of backbone", link.id.c_str());
+ link->latency =
+ xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of backbone " + link->id);
lua_pop(L, 1);
lua_pushstring(L, "sharing_policy");
lua_gettable(L, -2);
const char* policy = lua_tostring(L, -1);
lua_pop(L, 1);
- link.policy = link_policy_get_by_name(policy);
+ link->policy = link_policy_get_by_name(policy);
- sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl());
+ routing_cluster_add_backbone(std::move(link));
return 0;
}
host.speed_per_pstate.push_back(lua_tonumber(L, -1));
else // LUA_TSTRING
host.speed_per_pstate.push_back(
- xbt_parse_get_speed(ar.short_src, ar.currentline, lua_tostring(L, -1), "speed of host", host.id));
+ xbt_parse_get_speed(ar.short_src, ar.currentline, lua_tostring(L, -1), "speed of host " + host.id));
lua_pop(L, 1);
// get core
host.state_trace = simgrid::kernel::profile::Profile::from_file(filename);
lua_pop(L, 1);
- sg_platf_new_host(&host);
+ sg_platf_new_host_begin(&host);
+ sg_platf_new_host_seal(0);
return 0;
}
if (type == LUA_TNUMBER)
link.bandwidths.push_back(lua_tonumber(L, -1));
else // LUA_TSTRING
- link.bandwidths.push_back(xbt_parse_get_bandwidth(ar.short_src, ar.currentline, lua_tostring(L, -1),
- "bandwidth of link", link.id.c_str()));
+ link.bandwidths.push_back(
+ xbt_parse_get_bandwidth(ar.short_src, ar.currentline, lua_tostring(L, -1), "bandwidth of link " + link.id));
lua_pop(L, 1);
//get latency value
if (type == LUA_TNUMBER)
link.latency = lua_tonumber(L, -1);
else // LUA_TSTRING
- link.latency =
- xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of link", link.id.c_str());
+ link.latency = xbt_parse_get_time(ar.short_src, ar.currentline, lua_tostring(L, -1), "latency of link " + link.id);
lua_pop(L, 1);
/*Optional Arguments */
const char* coords = lua_tostring(L, -1);
lua_pop(L,1);
- sg_platf_new_router(name, coords);
+ sg_platf_new_router(name, coords ? coords : "");
return 0;
}
boost::split(names, str, boost::is_any_of(", \t\r\n"));
if (names.empty()) {
/* unique name */
- route.link_list.push_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1))->get_impl());
+ route.link_list.emplace_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
- simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
- route.link_list.push_back(link);
+ route.link_list.emplace_back(simgrid::s4u::Link::by_name(name));
}
}
}
*/
lua_pushstring(L,"symmetrical");
lua_gettable(L,-2);
- if (lua_isstring(L, -1)) {
- const char* value = lua_tostring(L, -1);
- if (strcmp("YES", value) == 0)
- route.symmetrical = true;
- else
- route.symmetrical = false;
- }
- else {
- route.symmetrical = true;
- }
+ route.symmetrical = (not lua_isstring(L, -1) || strcasecmp("YES", lua_tostring(L, -1)) == 0);
lua_pop(L,1);
- route.gw_src = nullptr;
- route.gw_dst = nullptr;
-
sg_platf_new_route(&route);
return 0;
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::s4u::Link::by_name(lua_tostring(L, -1))->get_impl());
+ ASroute.link_list.emplace_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1)));
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
- simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
- ASroute.link_list.push_back(link);
+ ASroute.link_list.emplace_back(simgrid::s4u::Link::by_name(name));
}
}
}
lua_pushstring(L,"symmetrical");
lua_gettable(L,-2);
- if (lua_isstring(L, -1)) {
- const char* value = lua_tostring(L, -1);
- if (strcmp("YES", value) == 0)
- ASroute.symmetrical = true;
- else
- ASroute.symmetrical = false;
- }
- else {
- ASroute.symmetrical = true;
- }
+ ASroute.symmetrical = (not lua_isstring(L, -1) || strcasecmp("YES", lua_tostring(L, -1)) == 0);
lua_pop(L,1);
sg_platf_new_route(&ASroute);
simgrid::kernel::routing::ZoneCreationArgs AS;
AS.id = id;
AS.routing = mode;
- simgrid::kernel::routing::NetZoneImpl* new_as = sg_platf_new_Zone_begin(&AS);
+ simgrid::kernel::routing::NetZoneImpl* new_as = sg_platf_new_zone_begin(&AS);
/* Build a Lua representation of the new AS on the stack */
lua_newtable(L);
int console_AS_seal(lua_State*)
{
XBT_DEBUG("Sealing AS");
- sg_platf_new_Zone_seal();
+ sg_platf_new_zone_seal();
return 0;
}
