NetZoneImpl::~NetZoneImpl()
{
- for (auto& kv : bypassRoutes_)
+ for (auto const& kv : bypassRoutes_)
delete kv.second;
simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_);
surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
if (props != nullptr)
- for (auto kv : *props)
+ for (auto const& kv : *props)
res->setProperty(kv.first, kv.second);
simgrid::s4u::Host::onCreation(*res); // notify the signal
{
/* Argument validity checks */
if (e_route->gw_dst) {
- XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(),
- e_route->dst->cname(), e_route->gw_dst->cname());
+ XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", e_route->src->getCname(), e_route->gw_src->getCname(),
+ e_route->dst->getCname(), e_route->gw_dst->getCname());
xbt_assert(not e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
- e_route->src->cname(), e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname());
+ e_route->src->getCname(), e_route->gw_src->getCname(), e_route->dst->getCname(),
+ e_route->gw_dst->getCname());
xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
- "The bypass route between %s@%s and %s@%s already exists.", e_route->src->cname(),
- e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname());
+ "The bypass route between %s@%s and %s@%s already exists.", e_route->src->getCname(),
+ e_route->gw_src->getCname(), e_route->dst->getCname(), e_route->gw_dst->getCname());
} else {
- XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->cname(), e_route->dst->cname());
+ XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->getCname(), e_route->dst->getCname());
xbt_assert(not e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.",
- e_route->src->cname(), e_route->dst->cname());
+ e_route->src->getCname(), e_route->dst->getCname());
xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
- "The bypass route between %s and %s already exists.", e_route->src->cname(), e_route->dst->cname());
+ "The bypass route between %s and %s already exists.", e_route->src->getCname(),
+ e_route->dst->getCname());
}
/* Build a copy that will be stored in the dict */
kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(e_route->gw_src, e_route->gw_dst);
- for (auto link : *e_route->link_list)
+ for (auto const& link : *e_route->link_list)
newRoute->links.push_back(link);
/* Store it */
NetZoneImpl* src_as = src->netzone();
NetZoneImpl* dst_as = dst->netzone();
- xbt_assert(src_as, "Host %s must be in a netzone", src->cname());
- xbt_assert(dst_as, "Host %s must be in a netzone", dst->cname());
+ xbt_assert(src_as, "Host %s must be in a netzone", src->getCname());
+ xbt_assert(dst_as, "Host %s must be in a netzone", dst->getCname());
/* (2) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
if (dst->netzone() == this && src->netzone() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::LinkImpl* link : bypassedRoute->links) {
+ for (surf::LinkImpl* const& link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
- XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->cname(), dst->cname(),
+ XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->getCname(), dst->getCname(),
bypassedRoute->links.size());
return true;
}
if (bypassedRoute) {
XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links. We may have to complete it with recursive "
"calls to getRoute",
- src->cname(), dst->cname(), bypassedRoute->links.size());
+ src->getCname(), dst->getCname(), bypassedRoute->links.size());
if (src != key.first)
getGlobalRoute(src, bypassedRoute->gw_src, links, latency);
- for (surf::LinkImpl* link : bypassedRoute->links) {
+ for (surf::LinkImpl* const& link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
getGlobalRoute(bypassedRoute->gw_dst, dst, links, latency);
return true;
}
- XBT_DEBUG("No bypass route from '%s' to '%s'.", src->cname(), dst->cname());
+ XBT_DEBUG("No bypass route from '%s' to '%s'.", src->getCname(), dst->getCname());
return false;
}
s_sg_platf_route_cbarg_t route;
memset(&route, 0, sizeof(route));
- XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname());
+ XBT_DEBUG("Resolve route from '%s' to '%s'", src->getCname(), dst->getCname());
/* Find how src and dst are interconnected */
NetZoneImpl *common_ancestor;
common_ancestor->getLocalRoute(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
- src->cname(), dst->cname());
+ src->getCname(), dst->getCname());
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != route.gw_src)
getGlobalRoute(src, route.gw_src, links, latency);
- for (auto link : *route.link_list)
+ for (auto const& link : *route.link_list)
links->push_back(link);
delete route.link_list;