X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a..e95d2dda61913a92ff3a9d1b7c368ba6e1443b30:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 5a6483624c..f896d7a539 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -1,12 +1,12 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/kernel/routing/NetPoint.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,29 +21,30 @@ 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; + NetPoint* gw_src; + NetPoint* gw_dst; std::vector links; }; -NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name) +NetZoneImpl::NetZoneImpl(NetZone* father, std::string name) : NetZone(father, name) { - xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), - "Refusing to create a second NetZone called '%s'.", name); + xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name.c_str()), + "Refusing to create a second NetZone called '%s'.", name.c_str()); netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast(father)); - XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netpoint_->id()); + XBT_DEBUG("NetZone '%s' created with the id '%u'", name.c_str(), netpoint_->id()); } + NetZoneImpl::~NetZoneImpl() { - for (auto& kv : bypassRoutes_) + for (auto const& 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, - std::unordered_map* props) + std::map* props) { simgrid::s4u::Host* res = new simgrid::s4u::Host(name); @@ -55,40 +56,41 @@ simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vectorcreateCpu(res, speedPerPstate, coreAmount); if (props != nullptr) - for (auto kv : *props) - res->setProperty(kv.first.c_str(), kv.second.c_str()); + for (auto const& kv : *props) + res->setProperty(kv.first, kv.second); - simgrid::s4u::Host::onCreation(*res); + simgrid::s4u::Host::onCreation(*res); // notify the signal return res; } -void NetZoneImpl::addBypassRoute(sg_platf_route_cbarg_t e_route) +void NetZoneImpl::addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { /* 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_assert(!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()); + if (gw_dst) { + XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", src->getCname(), gw_src->getCname(), dst->getCname(), + gw_dst->getCname()); + xbt_assert(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->getCname(), + gw_src->getCname(), dst->getCname(), gw_dst->getCname()); + xbt_assert(bypassRoutes_.find({src, dst}) == bypassRoutes_.end(), + "The bypass route between %s@%s and %s@%s already exists.", src->getCname(), gw_src->getCname(), + dst->getCname(), gw_dst->getCname()); } 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(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()); + XBT_DEBUG("Load bypassRoute from %s to %s", src->getCname(), dst->getCname()); + xbt_assert(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->getCname(), + dst->getCname()); + xbt_assert(bypassRoutes_.find({src, dst}) == bypassRoutes_.end(), + "The bypass route between %s and %s already exists.", src->getCname(), 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) + kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(gw_src, gw_dst); + for (auto const& link : link_list) newRoute->links.push_back(link); /* Store it */ - bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute}); + bypassRoutes_.insert({{src, dst}, newRoute}); } /** @brief Get the common ancestor and its first children in each line leading to src and dst @@ -159,21 +161,21 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, 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 path_src; 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. @@ -202,7 +204,7 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, /* PRECONDITION: this is the common ancestor of src and dst */ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector* links, double* latency) + /* OUT */ std::vector& links, double* latency) { // If never set a bypass route return nullptr without any further computations if (bypassRoutes_.empty()) @@ -212,12 +214,12 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, 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) { - links->push_back(link); + 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; } @@ -260,15 +262,17 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, for (int i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_}; - if (bypassRoutes_.find(key) != bypassRoutes_.end()) { - bypassedRoute = bypassRoutes_.at(key); + auto bpr = bypassRoutes_.find(key); + if (bpr != bypassRoutes_.end()) { + bypassedRoute = bpr->second; break; } } if (max <= max_index_src && i <= max_index_dst) { key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_}; - if (bypassRoutes_.find(key) != bypassRoutes_.end()) { - bypassedRoute = bypassRoutes_.at(key); + auto bpr = bypassRoutes_.find(key); + if (bpr != bypassRoutes_.end()) { + bypassedRoute = bpr->second; break; } } @@ -279,8 +283,9 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, if (max <= max_index_src && max <= max_index_dst) { key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_}; - if (bypassRoutes_.find(key) != bypassRoutes_.end()) { - bypassedRoute = bypassRoutes_.at(key); + auto bpr = bypassRoutes_.find(key); + if (bpr != bypassRoutes_.end()) { + bypassedRoute = bpr->second; break; } } @@ -290,37 +295,36 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, 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, const_cast(bypassedRoute->gw_src), links, latency); - for (surf::LinkImpl* link : bypassedRoute->links) { - links->push_back(link); + getGlobalRoute(src, bypassedRoute->gw_src, links, latency); + for (surf::LinkImpl* const& 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()); + XBT_DEBUG("No bypass route from '%s' to '%s'.", src->getCname(), dst->getCname()); return false; } void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, - /* OUT */ std::vector* links, double* latency) + /* OUT */ std::vector& links, double* latency) { - s_sg_platf_route_cbarg_t route; - memset(&route, 0, sizeof(route)); + RouteCreationArgs 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; 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)) @@ -328,25 +332,23 @@ void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, /* If src and dst are in the same netzone, life is good */ if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ - route.link_list = links; + route.link_list = std::move(links); common_ancestor->getLocalRoute(src, dst, &route, latency); + links = std::move(route.link_list); return; } /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ - route.link_list = new std::vector(); - 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) - links->push_back(link); - delete route.link_list; + for (auto const& link : route.link_list) + links.push_back(link); /* If dest gateway is not our destination, we have to recursively find our way from this point */ if (route.gw_dst != dst)