X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30aca4d4af004d1ec899d12f0a9fe3997e9be15e..74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 21780d27f6..7c5997237e 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,15 +1,14 @@ -/* 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/FloydZone.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include "xbt/log.h" -#include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); @@ -22,7 +21,7 @@ namespace simgrid { namespace kernel { namespace routing { -FloydZone::FloydZone(NetZone* father, const char* name) : RoutedZone(father, name) +FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name) { predecessorTable_ = nullptr; costTable_ = nullptr; @@ -33,10 +32,10 @@ FloydZone::~FloydZone() { if (linkTable_ == nullptr) // Dealing with a parse error in the file? return; - int table_size = vertices_.size(); + unsigned int table_size = getTableSize(); /* Delete link_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++) routing_route_free(TO_FLOYD_LINK(i, j)); xbt_free(linkTable_); @@ -44,9 +43,9 @@ FloydZone::~FloydZone() xbt_free(costTable_); } -void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) +void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) { - size_t table_size = vertices_.size(); + unsigned int table_size = getTableSize(); getRouteCheckParams(src, dst); @@ -66,8 +65,8 @@ void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route->gw_dst = route_stack.front()->gw_dst; } - sg_netcard_t prev_dst_gw = nullptr; - while (!route_stack.empty()) { + sg_netpoint_t prev_dst_gw = nullptr; + while (not route_stack.empty()) { sg_platf_route_cbarg_t e_route = route_stack.back(); route_stack.pop_back(); if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && @@ -75,7 +74,7 @@ void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t getGlobalRoute(prev_dst_gw, e_route->gw_src, route->link_list, lat); } - for (auto link : *e_route->link_list) { + for (auto const& link : *e_route->link_list) { route->link_list->push_back(link); if (lat) *lat += link->latency(); @@ -88,19 +87,19 @@ void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t void FloydZone::addRoute(sg_platf_route_cbarg_t route) { /* set the size of table routing */ - int table_size = static_cast(vertices_.size()); + unsigned int table_size = getTableSize(); addRouteCheckParams(route); - if (!linkTable_) { + if (not linkTable_) { /* Create Cost, Predecessor and Link tables */ costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */ predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */ linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ /* Initialize costs and predecessors */ - 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++) { TO_FLOYD_COST(i, j) = DBL_MAX; TO_FLOYD_PRED(i, j) = -1; TO_FLOYD_LINK(i, j) = nullptr; @@ -108,7 +107,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) } /* 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) // netzone route (to adapt the error message, if any) xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()), "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", route->src->name().c_str(), route->gw_src->name().c_str(), route->dst->name().c_str(), @@ -124,7 +123,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) (TO_FLOYD_LINK(route->src->id(), route->dst->id()))->link_list->size(); if (route->symmetrical == true) { - if (route->gw_dst) // AS route (to adapt the error message, if any) + if (route->gw_dst) // netzone route (to adapt the error message, if any) xbt_assert( nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()), "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", @@ -136,15 +135,15 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) route->dst->name().c_str(), route->src->name().c_str()); 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_src && !route->gw_dst) + if (not route->gw_src && not route->gw_dst) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str()); else - XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(), + XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(), route->src->name().c_str(), route->gw_dst->name().c_str()); TO_FLOYD_LINK(route->dst->id(), route->src->id()) = newExtendedRoute(hierarchy_, route, 0); @@ -157,9 +156,9 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) void FloydZone::seal() { /* set the size of table routing */ - size_t table_size = vertices_.size(); + unsigned int table_size = getTableSize(); - if (!linkTable_) { + if (not linkTable_) { /* Create Cost, Predecessor and Link tables */ costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */ predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */ @@ -178,11 +177,11 @@ void FloydZone::seal() if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { for (unsigned int i = 0; i < table_size; i++) { sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); - if (!e_route) { + 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_FLOYD_LINK(i, i) = e_route; TO_FLOYD_PRED(i, i) = i;