X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44ea423d2d27e986f35e6b8d60772b7acec89916..ffd004a13acd17db31f5d5df1bc2fc2dc696b9a9:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 3095394650..593810d92d 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,138 +1,118 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. 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/NetPoint.hpp" +#include "simgrid/kernel/routing/FloydZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "xbt/log.h" +#include "surf/surf.hpp" +#include "xbt/string.hpp" #include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); -#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size] -#define TO_FLOYD_PRED(i, j) (predecessorTable_)[(i) + (j)*table_size] -#define TO_FLOYD_LINK(i, j) (linkTable_)[(i) + (j)*table_size] +#define TO_FLOYD_COST(i, j) (cost_table_)[(i) + (j)*table_size] +#define TO_FLOYD_PRED(i, j) (predecessor_table_)[(i) + (j)*table_size] +#define TO_FLOYD_LINK(i, j) (link_table_)[(i) + (j)*table_size] namespace simgrid { namespace kernel { namespace routing { -FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name) -{ - predecessorTable_ = nullptr; - costTable_ = nullptr; - linkTable_ = nullptr; -} - FloydZone::~FloydZone() { - if (linkTable_ == nullptr) // Dealing with a parse error in the file? - return; - unsigned int table_size = getTableSize(); /* Delete link_table */ - for (unsigned int i = 0; i < table_size; i++) - for (unsigned int j = 0; j < table_size; j++) - delete TO_FLOYD_LINK(i, j); - delete[] linkTable_; + for (auto const* link : link_table_) + delete link; +} - delete[] predecessorTable_; - delete[] costTable_; +void FloydZone::init_tables(unsigned int table_size) +{ + if (link_table_.empty()) { + /* Create and initialize Cost, Predecessor and Link tables */ + cost_table_.resize(table_size * table_size, DBL_MAX); /* link cost from host to host */ + predecessor_table_.resize(table_size * table_size, -1); /* predecessor host numbers */ + link_table_.resize(table_size * table_size, nullptr); /* actual link between src and dst */ + } } -void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) +void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) { - unsigned int table_size = getTableSize(); + unsigned int table_size = get_table_size(); - getRouteCheckParams(src, dst); + get_route_check_params(src, dst); /* create a result route */ - std::vector route_stack; + std::vector route_stack; unsigned int cur = dst->id(); do { int pred = TO_FLOYD_PRED(src->id(), cur); if (pred == -1) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); + throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); route_stack.push_back(TO_FLOYD_LINK(pred, cur)); cur = pred; } while (cur != src->id()); - if (hierarchy_ == RoutingMode::recursive) { - route->gw_src = route_stack.back()->gw_src; - route->gw_dst = route_stack.front()->gw_dst; + if (get_hierarchy() == RoutingMode::recursive) { + route->gw_src_ = route_stack.back()->gw_src_; + route->gw_dst_ = route_stack.front()->gw_dst_; } - sg_netpoint_t prev_dst_gw = nullptr; + NetPoint* prev_dst_gw = nullptr; while (not route_stack.empty()) { - RouteCreationArgs* e_route = route_stack.back(); + const Route* e_route = route_stack.back(); route_stack.pop_back(); - if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && - prev_dst_gw->getCname() != e_route->gw_src->getCname()) { - getGlobalRoute(prev_dst_gw, e_route->gw_src, route->link_list, lat); + if (get_hierarchy() == RoutingMode::recursive && prev_dst_gw != nullptr && + prev_dst_gw->get_cname() != e_route->gw_src_->get_cname()) { + get_global_route(prev_dst_gw, e_route->gw_src_, route->link_list_, lat); } - for (auto const& link : e_route->link_list) { - route->link_list.push_back(link); + for (auto const& link : e_route->link_list_) { + route->link_list_.push_back(link); if (lat) - *lat += link->latency(); + *lat += link->get_latency(); } - prev_dst_gw = e_route->gw_dst; + prev_dst_gw = e_route->gw_dst_; } } -void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, - kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) +void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + const std::vector& link_list_, bool symmetrical) { /* set the size of table routing */ - unsigned int table_size = getTableSize(); - - addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical); - - if (not linkTable_) { - /* Create Cost, Predecessor and Link tables */ - 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 RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ - - /* Initialize costs and predecessors */ - 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; - } - } + unsigned int table_size = get_table_size(); + init_tables(table_size); + + add_route_check_params(src, dst, gw_src, gw_dst, link_list_, symmetrical); /* Check that the route does not already exist */ - if (gw_dst) // netzone route (to adapt the error message, if any) + if (gw_dst && gw_src) // netzone route (to adapt the error message, if any) xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()), "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", - src->getCname(), gw_src->getCname(), dst->getCname(), gw_dst->getCname()); + src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname()); else xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()), - "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->getCname(), - dst->getCname()); + "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(), + dst->get_cname()); - TO_FLOYD_LINK(src->id(), dst->id()) = - newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1); + TO_FLOYD_LINK(src->id(), dst->id()) = new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list_, true); TO_FLOYD_PRED(src->id(), dst->id()) = src->id(); - TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list.size(); + TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list_.size(); - if (symmetrical == true) { - if (gw_dst) // netzone route (to adapt the error message, if any) + if (symmetrical) { + if (gw_dst && gw_src) // netzone route (to adapt the error message, if any) xbt_assert( nullptr == TO_FLOYD_LINK(dst->id(), src->id()), "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", - dst->getCname(), gw_dst->getCname(), src->getCname(), gw_src->getCname()); + dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname()); else xbt_assert(nullptr == TO_FLOYD_LINK(dst->id(), src->id()), "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.", - dst->getCname(), src->getCname()); + dst->get_cname(), src->get_cname()); if (gw_dst && gw_src) { NetPoint* gw_tmp = gw_src; @@ -141,47 +121,32 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi } if (not gw_src || not gw_dst) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->getCname(), src->getCname()); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->get_cname(), src->get_cname()); else - XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->getCname(), gw_src->getCname(), src->getCname(), - gw_dst->getCname()); + XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->get_cname(), gw_src->get_cname(), + src->get_cname(), gw_dst->get_cname()); - TO_FLOYD_LINK(dst->id(), src->id()) = - newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0); + TO_FLOYD_LINK(dst->id(), src->id()) = new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list_, false); TO_FLOYD_PRED(dst->id(), src->id()) = dst->id(); TO_FLOYD_COST(dst->id(), src->id()) = - (TO_FLOYD_LINK(dst->id(), src->id()))->link_list.size(); /* count of links, old model assume 1 */ + (TO_FLOYD_LINK(dst->id(), src->id()))->link_list_.size(); /* count of links, old model assume 1 */ } } -void FloydZone::seal() +void FloydZone::do_seal() { /* set the size of table routing */ - unsigned int table_size = getTableSize(); - - if (not linkTable_) { - /* Create Cost, Predecessor and Link tables */ - 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 RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ - - /* Initialize costs and predecessors */ - 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; - } - } + unsigned int table_size = get_table_size(); + init_tables(table_size); /* Add the loopback if needed */ - if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { + if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) { for (unsigned int i = 0; i < table_size; i++) { - RouteCreationArgs* e_route = TO_FLOYD_LINK(i, i); - if (not e_route) { - e_route = new RouteCreationArgs(); - e_route->link_list.push_back(surf_network_model->loopback_); - TO_FLOYD_LINK(i, i) = e_route; + Route* route = TO_FLOYD_LINK(i, i); + if (not route) { + route = new Route(); + route->link_list_.push_back(get_network_model()->loopback_); + TO_FLOYD_LINK(i, i) = route; TO_FLOYD_PRED(i, i) = i; TO_FLOYD_COST(i, i) = 1; } @@ -201,6 +166,14 @@ void FloydZone::seal() } } } +} // namespace routing +} // namespace kernel + +namespace s4u { +NetZone* create_floyd_zone(const std::string& name) +{ + return (new kernel::routing::FloydZone(name))->get_iface(); } -} -} +} // namespace s4u + +} // namespace simgrid