X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98764fb7f88025109fbc0afe683577da397edbaf..596e36117322c22fd31372e7803bc197bcd4a016:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 4fa30698a8..e7429d8555 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -1,23 +1,21 @@ -/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2023. 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 "simgrid/kernel/routing/VivaldiZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" -#include "surf/surf.hpp" +#include +#include +#include +#include + +#include "src/kernel/resource/StandardLinkImpl.hpp" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_vivaldi, ker_platform, "Kernel Vivaldi Routing"); namespace simgrid { -namespace kernel { -namespace routing { +namespace kernel::routing { namespace vivaldi { @@ -45,80 +43,65 @@ Coords::Coords(NetPoint* netpoint, const std::string& coordStr) } } // namespace vivaldi -static inline double euclidean_dist_comp(int index, std::vector* src, std::vector* dst) +static inline double euclidean_dist_comp(double src_coord, double dst_coord) { - double src_coord = src->at(index); - double dst_coord = dst->at(index); - return (src_coord - dst_coord) * (src_coord - dst_coord); } -static std::vector* netpoint_get_coords(NetPoint* np) +static const std::vector& netpoint_get_coords(const NetPoint* np) { - auto* coords = np->extension(); + const auto* coords = np->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", (np->is_netzone() ? "Netzone" : (np->is_host() ? "Host" : "Router")), np->get_cname(), np); - return &coords->coords; + return coords->coords; } -VivaldiZone::VivaldiZone(const std::string& name) : ClusterZone(name) {} - -void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, const std::string& coord) +void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out) { xbt_assert(netpoint->get_englobing_zone() == this, "Cannot add a peer link to a netpoint that is not in this netzone"); - new vivaldi::Coords(netpoint, coord); - - std::string link_up = "link_" + netpoint->get_name() + "_UP"; - std::string link_down = "link_" + netpoint->get_name() + "_DOWN"; - resource::LinkImpl* linkUp = - get_network_model()->create_link(link_up, std::vector(1, bw_out), s4u::Link::SharingPolicy::SHARED); - linkUp->seal(); - resource::LinkImpl* linkDown = - get_network_model()->create_link(link_down, std::vector(1, bw_in), s4u::Link::SharingPolicy::SHARED); - linkDown->seal(); - add_private_link_at(netpoint->id(), {linkUp, linkDown}); + std::string link_up = "link_" + netpoint->get_name() + "_UP"; + std::string link_down = "link_" + netpoint->get_name() + "_DOWN"; + const auto* linkUp = create_link(link_up, {bw_out})->seal(); + const auto* linkDown = create_link(link_down, {bw_in})->seal(); + add_route(netpoint, nullptr, nullptr, nullptr, {s4u::LinkInRoute(linkUp)}, false); + add_route(nullptr, netpoint, nullptr, nullptr, {s4u::LinkInRoute(linkDown)}, false); } -void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) +void VivaldiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { - XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); - + XBT_DEBUG("vivaldi getLocalRoute from '%s'[%lu] '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); + const auto* engine = s4u::Engine::get_instance(); if (src->is_netzone()) { std::string srcName = "router_" + src->get_name(); std::string dstName = "router_" + dst->get_name(); - route->gw_src = s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName); - route->gw_dst = s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName); - } - - /* Retrieve the private links */ - if (private_link_exists_at(src->id())) { - auto src_link = get_uplink_from(src->id()); - route->link_list.push_back(src_link); - if (lat) - *lat += src_link->get_latency(); + route->gw_src_ = engine->netpoint_by_name_or_null(srcName); + route->gw_dst_ = engine->netpoint_by_name_or_null(dstName); } - if (private_link_exists_at(dst->id())) { - auto dst_link = get_downlink_to(dst->id()); - route->link_list.push_back(dst_link); - if (lat) - *lat += dst_link->get_latency(); - } + StarZone::get_local_route(src, dst, route, lat); /* Compute the extra latency due to the euclidean distance if needed */ if (lat) { - std::vector* srcCoords = netpoint_get_coords(src); - std::vector* dstCoords = netpoint_get_coords(dst); + std::vector srcCoords = netpoint_get_coords(src); + std::vector dstCoords = netpoint_get_coords(dst); double euclidean_dist = - sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) + - fabs(srcCoords->at(2)) + fabs(dstCoords->at(2)); + sqrt(euclidean_dist_comp(srcCoords[0], dstCoords[0]) + euclidean_dist_comp(srcCoords[1], dstCoords[1])) + + fabs(srcCoords[2]) + fabs(dstCoords[2]); XBT_DEBUG("Updating latency %f += %f", *lat, euclidean_dist); *lat += euclidean_dist / 1000.0; // From .ms to .s } } -} // namespace routing -} // namespace kernel + +} // namespace kernel::routing + +namespace s4u { +NetZone* create_vivaldi_zone(const std::string& name) +{ + return (new kernel::routing::VivaldiZone(name))->get_iface(); +} +} // namespace s4u + } // namespace simgrid