X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..b4ac368a8512fa8ec30d04f55c4a3c660e9439b9:/src/kernel/routing/FloydZone.cpp?ds=sidebyside diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 894aa18b7f..b434384bcd 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -8,7 +8,7 @@ #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"); @@ -21,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; @@ -32,20 +32,20 @@ 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_); + delete[] linkTable_; - xbt_free(predecessorTable_); - xbt_free(costTable_); + delete[] predecessorTable_; + delete[] costTable_; } 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); @@ -55,7 +55,7 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg do { int pred = TO_FLOYD_PRED(src->id(), cur); if (pred == -1) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); route_stack.push_back(TO_FLOYD_LINK(pred, cur)); cur = pred; } while (cur != src->id()); @@ -70,11 +70,11 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg sg_platf_route_cbarg_t e_route = route_stack.back(); route_stack.pop_back(); if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && - strcmp(prev_dst_gw->name().c_str(), e_route->gw_src->name().c_str())) { + prev_dst_gw->getCname() != e_route->gw_src->getCname()) { 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(); @@ -87,19 +87,19 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg 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 (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 */ + costTable_ = new double[table_size * table_size]; /* link cost from host to host */ + predecessorTable_ = new int[table_size * table_size]; /* predecessor host numbers */ + linkTable_ = new 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; @@ -110,12 +110,11 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) 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(), - route->gw_dst->name().c_str()); + route->src->getCname(), route->gw_src->getCname(), route->dst->getCname(), route->gw_dst->getCname()); else xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()), "The route between %s and %s already exists (Rq: routes are symmetrical by default).", - route->src->name().c_str(), route->dst->name().c_str()); + route->src->getCname(), route->dst->getCname()); TO_FLOYD_LINK(route->src->id(), route->dst->id()) = newExtendedRoute(hierarchy_, route, 1); TO_FLOYD_PRED(route->src->id(), route->dst->id()) = route->src->id(); @@ -127,12 +126,11 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) 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.", - route->dst->name().c_str(), route->gw_dst->name().c_str(), route->src->name().c_str(), - route->gw_src->name().c_str()); + route->dst->getCname(), route->gw_dst->getCname(), route->src->getCname(), route->gw_src->getCname()); else xbt_assert(nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()), "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.", - route->dst->name().c_str(), route->src->name().c_str()); + route->dst->getCname(), route->src->getCname()); if (route->gw_dst && route->gw_src) { NetPoint* gw_tmp = route->gw_src; @@ -140,11 +138,11 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) route->gw_dst = gw_tmp; } - 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()); + if (not route->gw_src || not route->gw_dst) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->getCname(), route->src->getCname()); else - 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()); + XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->getCname(), route->gw_src->getCname(), + route->src->getCname(), route->gw_dst->getCname()); TO_FLOYD_LINK(route->dst->id(), route->src->id()) = newExtendedRoute(hierarchy_, route, 0); TO_FLOYD_PRED(route->dst->id(), route->src->id()) = route->dst->id(); @@ -156,13 +154,13 @@ 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 (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 */ + costTable_ = new double[table_size * table_size]; /* link cost from host to host */ + predecessorTable_ = new int[table_size * table_size]; /* predecessor host numbers */ + linkTable_ = new sg_platf_route_cbarg_t[table_size * table_size]; /* actual link between src and dst */ /* Initialize costs and predecessors */ for (unsigned int i = 0; i < table_size; i++) @@ -178,7 +176,7 @@ void FloydZone::seal() for (unsigned int i = 0; i < table_size; i++) { sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); if (not e_route) { - e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); + e_route = new s_sg_platf_route_cbarg_t; e_route->gw_src = nullptr; e_route->gw_dst = nullptr; e_route->link_list = new std::vector();