X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18117755285a374ec3d5830309c924f2830e3ba..c4792b986c90263d97a3db8e68279f5512b65fa1:/src/kernel/routing/FullZone.cpp diff --git a/src/kernel/routing/FullZone.cpp b/src/kernel/routing/FullZone.cpp index 3a3c6dcf5b..429f07908b 100644 --- a/src/kernel/routing/FullZone.cpp +++ b/src/kernel/routing/FullZone.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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/FullZone.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); @@ -14,31 +14,27 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); namespace simgrid { namespace kernel { namespace routing { -AsFull::AsFull(As* father, const char* name) : AsRoutedGraph(father, name) +FullZone::FullZone(NetZone* father, std::string name) : RoutedZone(father, name) { } -void AsFull::seal() +void FullZone::seal() { - int i; - sg_platf_route_cbarg_t e_route; + unsigned int table_size = getTableSize(); - /* set utils vars */ - int table_size = static_cast(vertices_.size()); - - /* Create table if necessary */ - if (!routingTable_) + /* Create table if needed */ + if (not routingTable_) routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* Add the loopback if needed */ if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { - for (i = 0; i < table_size; i++) { - e_route = TO_ROUTE_FULL(i, i); - if (!e_route) { + for (unsigned int i = 0; i < table_size; i++) { + sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(i, i); + if (not e_route) { e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); e_route->gw_src = nullptr; e_route->gw_dst = nullptr; - e_route->link_list = new std::vector(); + e_route->link_list = new std::vector(); e_route->link_list->push_back(surf_network_model->loopback_); TO_ROUTE_FULL(i, i) = e_route; } @@ -46,13 +42,13 @@ void AsFull::seal() } } -AsFull::~AsFull() +FullZone::~FullZone() { if (routingTable_) { - int table_size = static_cast(vertices_.size()); + unsigned int table_size = getTableSize(); /* Delete routing table */ - for (int i = 0; i < table_size; i++) - for (int j = 0; j < table_size; j++) { + for (unsigned int i = 0; i < table_size; i++) + for (unsigned int j = 0; j < table_size; j++) { if (TO_ROUTE_FULL(i, j)) { delete TO_ROUTE_FULL(i, j)->link_list; xbt_free(TO_ROUTE_FULL(i, j)); @@ -62,17 +58,17 @@ AsFull::~AsFull() } } -void AsFull::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t res, double* lat) +void FullZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t res, double* lat) { - XBT_DEBUG("full getLocalRoute from %s[%d] to %s[%d]", src->cname(), src->id(), dst->cname(), dst->id()); + XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->cname(), src->id(), dst->cname(), dst->id()); - size_t table_size = vertices_.size(); + unsigned int table_size = getTableSize(); sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(src->id(), dst->id()); if (e_route != nullptr) { res->gw_src = e_route->gw_src; res->gw_dst = e_route->gw_dst; - for (auto link : *e_route->link_list) { + for (auto const& link : *e_route->link_list) { res->link_list->push_back(link); if (lat) *lat += link->latency(); @@ -80,19 +76,19 @@ void AsFull::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t re } } -void AsFull::addRoute(sg_platf_route_cbarg_t route) +void FullZone::addRoute(sg_platf_route_cbarg_t route) { - NetCard* src = route->src; - NetCard* dst = route->dst; + NetPoint* src = route->src; + NetPoint* dst = route->dst; addRouteCheckParams(route); - size_t table_size = vertices_.size(); + unsigned int table_size = getTableSize(); - if (!routingTable_) + if (not routingTable_) routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* Check that the route does not already exist */ - if (route->gw_dst) // AS route (to adapt the error message, if any) + if (route->gw_dst) // inter-zone route (to adapt the error message, if any) xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()), "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", src->cname(), route->gw_src->cname(), dst->cname(), route->gw_dst->cname()); @@ -102,16 +98,15 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route) dst->cname()); /* Add the route to the base */ - TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, 1); - TO_ROUTE_FULL(src->id(), dst->id())->link_list->shrink_to_fit(); + TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, true); if (route->symmetrical == true && src != dst) { if (route->gw_dst && route->gw_src) { - NetCard* gw_tmp = route->gw_src; + NetPoint* gw_tmp = route->gw_src; route->gw_src = route->gw_dst; route->gw_dst = gw_tmp; } - if (route->gw_dst) // AS route (to adapt the error message, if any) + if (route->gw_dst && route->gw_src) // inter-zone route (to adapt the error message, if any) xbt_assert( nullptr == TO_ROUTE_FULL(dst->id(), src->id()), "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", @@ -121,8 +116,7 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route) "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.", dst->cname(), src->cname()); - TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, 0); - TO_ROUTE_FULL(dst->id(), src->id())->link_list->shrink_to_fit(); + TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, false); } } }