X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7344bf4cd4b75fe33e19f2ac1994b200962aa7e..b5f9e42977485f8fb5f5818e45182bc7f6feaba9:/src/kernel/routing/FullZone.cpp diff --git a/src/kernel/routing/FullZone.cpp b/src/kernel/routing/FullZone.cpp index 7f6a98e169..4c47c460cd 100644 --- a/src/kernel/routing/FullZone.cpp +++ b/src/kernel/routing/FullZone.cpp @@ -1,124 +1,112 @@ -/* Copyright (c) 2009-2016. 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/FullZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/FullZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" +#include "surf/surf.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); -#define TO_ROUTE_FULL(i, j) routingTable_[(i) + (j)*table_size] - namespace simgrid { namespace kernel { namespace routing { -FullZone::FullZone(NetZone* father, const char* name) : RoutedZone(father, name) -{ -} -void FullZone::seal() +void FullZone::check_routing_table() { - unsigned int table_size = getTableSize(); - - /* 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 (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->push_back(surf_network_model->loopback_); - TO_ROUTE_FULL(i, i) = e_route; - } + unsigned int table_size = get_table_size(); + /* assure routing_table is table_size X table_size */ + if (routing_table_.size() != table_size) { + routing_table_.resize(table_size); + for (auto& j : routing_table_) { + j.resize(table_size); } } } -FullZone::~FullZone() +void FullZone::do_seal() { - if (routingTable_) { - unsigned int table_size = getTableSize(); - /* Delete routing table */ - 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)); - } + check_routing_table(); + /* Add the loopback if needed */ + if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) { + for (unsigned int i = 0; i < get_table_size(); i++) { + auto& route = routing_table_[i][i]; + if (not route) { + route.reset(new Route()); + route->link_list_.push_back(get_network_model()->loopback_); } - xbt_free(routingTable_); + } } } -void FullZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t res, double* lat) +void FullZone::get_local_route(NetPoint* src, NetPoint* dst, Route* 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->get_cname(), src->id(), dst->get_cname(), dst->id()); - unsigned int table_size = getTableSize(); - sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(src->id(), dst->id()); + const auto& e_route = routing_table_[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) { - res->link_list->push_back(link); + res->gw_src_ = e_route->gw_src_; + res->gw_dst_ = e_route->gw_dst_; + for (auto const& link : e_route->link_list_) { + res->link_list_.push_back(link); if (lat) - *lat += link->latency(); + *lat += link->get_latency(); } } } -void FullZone::addRoute(sg_platf_route_cbarg_t route) +void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + const std::vector& link_list, bool symmetrical) { - NetPoint* src = route->src; - NetPoint* dst = route->dst; - addRouteCheckParams(route); - - unsigned int table_size = getTableSize(); + add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical); - if (not routingTable_) - routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); + check_routing_table(); /* Check that the route does not already exist */ - if (route->gw_dst) // inter-zone route (to adapt the error message, if any) - xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()), + if (gw_dst && gw_src) // inter-zone route (to adapt the error message, if any) + xbt_assert(nullptr == routing_table_[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()); + src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname()); else - xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()), - "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->cname(), - dst->cname()); + xbt_assert(nullptr == routing_table_[src->id()][dst->id()], + "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(), + dst->get_cname()); /* Add the route to the base */ - TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, true); - - if (route->symmetrical == true && src != dst) { - if (route->gw_dst && route->gw_src) { - NetPoint* gw_tmp = route->gw_src; - route->gw_src = route->gw_dst; - route->gw_dst = gw_tmp; + routing_table_[src->id()][dst->id()] = + std::unique_ptr(new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, true)); + + if (symmetrical && src != dst) { + if (gw_dst && gw_src) { + NetPoint* gw_tmp = gw_src; + gw_src = gw_dst; + gw_dst = gw_tmp; } - if (route->gw_dst) // inter-zone route (to adapt the error message, if any) + if (gw_dst && gw_src) // inter-zone route (to adapt the error message, if any) xbt_assert( - nullptr == TO_ROUTE_FULL(dst->id(), src->id()), + nullptr == routing_table_[dst->id()][src->id()], "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", - dst->cname(), route->gw_dst->cname(), src->cname(), route->gw_src->cname()); + dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname()); else - xbt_assert(nullptr == TO_ROUTE_FULL(dst->id(), src->id()), + xbt_assert(nullptr == routing_table_[dst->id()][src->id()], "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.", - dst->cname(), src->cname()); + dst->get_cname(), src->get_cname()); - TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, false); + routing_table_[dst->id()][src->id()] = + std::unique_ptr(new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, false)); } } +} // namespace routing +} // namespace kernel + +namespace s4u { +NetZone* create_full_zone(const std::string& name) +{ + return (new kernel::routing::FullZone(name))->get_iface(); } -} -} // namespace +} // namespace s4u + +} // namespace simgrid