X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c12189c716ea527ddcf8f8b55983213dead2bf..19b3962253112b19308537bc2400de141c119d99:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 464e973735..5a6483624c 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" @@ -23,23 +23,23 @@ public: explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} const NetPoint* gw_src; const NetPoint* gw_dst; - std::vector links; + std::vector links; }; NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name) { - xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netcardByNameOrNull(name), + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), "Refusing to create a second NetZone called '%s'.", name); - netcard_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast(father)); - XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netcard_->id()); + netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast(father)); + XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netpoint_->id()); } NetZoneImpl::~NetZoneImpl() { for (auto& kv : bypassRoutes_) delete kv.second; - simgrid::s4u::Engine::instance()->netcardUnregister(netcard_); + simgrid::s4u::Engine::instance()->netpointUnregister(netpoint_); } simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector* speedPerPstate, int coreAmount, @@ -202,7 +202,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,7 +212,7 @@ 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::Link* link : bypassedRoute->links) { + for (surf::LinkImpl* link : bypassedRoute->links) { links->push_back(link); if (latency) *latency += link->latency(); @@ -259,14 +259,14 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, for (int max = 0; max <= max_index; max++) { for (int i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { - key = {path_src.at(i)->netcard_, path_dst.at(max)->netcard_}; + key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; } } if (max <= max_index_src && i <= max_index_dst) { - key = {path_src.at(max)->netcard_, path_dst.at(i)->netcard_}; + key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; @@ -278,7 +278,7 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, break; if (max <= max_index_src && max <= max_index_dst) { - key = {path_src.at(max)->netcard_, path_dst.at(max)->netcard_}; + key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; @@ -293,7 +293,7 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, src->cname(), dst->cname(), bypassedRoute->links.size()); if (src != key.first) getGlobalRoute(src, const_cast(bypassedRoute->gw_src), links, latency); - for (surf::Link* link : bypassedRoute->links) { + for (surf::LinkImpl* link : bypassedRoute->links) { links->push_back(link); if (latency) *latency += link->latency(); @@ -307,7 +307,7 @@ bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst, } 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)); @@ -315,7 +315,9 @@ 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()); @@ -333,9 +335,9 @@ void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst, /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ - route.link_list = new std::vector(); + route.link_list = new std::vector(); - common_ancestor->getLocalRoute(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency); + 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());