X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d4bf7d1cd502bc979d98e35067872186f2a0a21..0342cac8cbf7d74cf6efa11b33abd8cb6d87cc3c:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index a5175ccff9..2b4a84d6aa 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2006-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ #include "src/kernel/routing/NetZoneImpl.hpp" -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" @@ -21,14 +21,14 @@ namespace routing { class BypassRoute { public: explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} - const NetPoint* gw_src; - const NetPoint* gw_dst; - std::vector links; + NetPoint* gw_src; + NetPoint* gw_dst; + std::vector links; }; NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name) { - xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), + xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name), "Refusing to create a second NetZone called '%s'.", name); netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast(father)); @@ -39,7 +39,7 @@ NetZoneImpl::~NetZoneImpl() for (auto& kv : bypassRoutes_) delete kv.second; - simgrid::s4u::Engine::instance()->netpointUnregister(netpoint_); + simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_); } simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector* speedPerPstate, int coreAmount, @@ -58,7 +58,7 @@ simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vectorsetProperty(kv.first.c_str(), kv.second.c_str()); - simgrid::s4u::Host::onCreation(*res); + simgrid::s4u::Host::onCreation(*res); // notify the signal return res; } @@ -69,15 +69,15 @@ void NetZoneImpl::addBypassRoute(sg_platf_route_cbarg_t e_route) 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_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", + 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()); 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()); } else { XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->cname(), e_route->dst->cname()); - xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", e_route->src->cname(), - e_route->dst->cname()); + 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()); 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()); } @@ -167,13 +167,13 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, NetZoneImpl* current = src->netzone(); while (current != nullptr) { path_src.push_back(current); - current = static_cast(current->father()); + current = static_cast(current->getFather()); } std::vector path_dst; current = dst->netzone(); while (current != nullptr) { path_dst.push_back(current); - current = static_cast(current->father()); + current = static_cast(current->getFather()); } /* (3) find the common father. @@ -292,14 +292,14 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, "calls to getRoute", src->cname(), dst->cname(), bypassedRoute->links.size()); if (src != key.first) - getGlobalRoute(src, const_cast(bypassedRoute->gw_src), links, latency); + getGlobalRoute(src, bypassedRoute->gw_src, links, latency); for (surf::LinkImpl* link : bypassedRoute->links) { links->push_back(link); if (latency) *latency += link->latency(); } if (dst != key.second) - getGlobalRoute(const_cast(bypassedRoute->gw_dst), dst, links, latency); + getGlobalRoute(bypassedRoute->gw_dst, dst, links, latency); return true; } XBT_DEBUG("No bypass route from '%s' to '%s'.", src->cname(), dst->cname()); @@ -315,10 +315,12 @@ void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname()); /* Find how src and dst are interconnected */ - NetZoneImpl *common_ancestor, *src_ancestor, *dst_ancestor; + NetZoneImpl *common_ancestor; + NetZoneImpl *src_ancestor; + NetZoneImpl *dst_ancestor; find_common_ancestors(src, dst, &common_ancestor, &src_ancestor, &dst_ancestor); - XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", common_ancestor->name(), - src_ancestor->name(), dst_ancestor->name()); + XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", common_ancestor->getCname(), + src_ancestor->getCname(), dst_ancestor->getCname()); /* Check whether a direct bypass is defined. If so, use it and bail out */ if (common_ancestor->getBypassRoute(src, dst, links, latency))