X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82de4ad22adaa434ff76600a99106bbfc040a9ce..6e9d86d55beb0e4da8e689bbd3ca576250c46cb4:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 8b0372559a..9f27b1bcf6 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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. */ @@ -18,8 +18,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf" namespace simgrid { namespace kernel { namespace routing { + namespace vivaldi { -simgrid::xbt::Extension Coords::EXTENSION_ID; + +xbt::Extension Coords::EXTENSION_ID; Coords::Coords(NetPoint* netpoint, const std::string& coordStr) { @@ -43,41 +45,30 @@ 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(NetPoint* np) { - simgrid::kernel::routing::vivaldi::Coords* coords = np->extension(); + 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; -} - -VivaldiZone::VivaldiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) - : ClusterZone(father, name, netmodel) -{ + return coords->coords; } -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 simgrid::kernel::routing::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 = - network_model_->create_link(link_up, std::vector(1, bw_out), 0, s4u::Link::SharingPolicy::SHARED); - resource::LinkImpl* linkDown = - network_model_->create_link(link_down, std::vector(1, bw_in), 0, s4u::Link::SharingPolicy::SHARED); - private_links_.insert({netpoint->id(), {linkUp, linkDown}}); + std::string link_up = "link_" + netpoint->get_name() + "_UP"; + std::string link_down = "link_" + netpoint->get_name() + "_DOWN"; + auto* linkUp = create_link(link_up, std::vector{bw_out})->seal(); + auto* linkDown = create_link(link_down, std::vector{bw_in})->seal(); + add_route(netpoint, nullptr, nullptr, nullptr, {linkUp->get_impl()}, false); + add_route(nullptr, netpoint, nullptr, nullptr, {linkDown->get_impl()}, false); } void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) @@ -87,48 +78,33 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg if (src->is_netzone()) { std::string srcName = "router_" + src->get_name(); std::string dstName = "router_" + dst->get_name(); - route->gw_src = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName); - route->gw_dst = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName); - } - - /* Retrieve the private links */ - auto src_link = private_links_.find(src->id()); - if (src_link != private_links_.end()) { - std::pair info = src_link->second; - if (info.first) { - route->link_list.push_back(info.first); - if (lat) - *lat += info.first->get_latency(); - } - } else { - XBT_DEBUG("Source of private link (%u) doesn't exist", src->id()); - } - - auto dst_link = private_links_.find(dst->id()); - if (dst_link != private_links_.end()) { - std::pair info = dst_link->second; - if (info.second) { - route->link_list.push_back(info.second); - if (lat) - *lat += info.second->get_latency(); - } - } else { - XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id()); + 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); } + 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 s4u { +NetZone* create_vivaldi_zone(const std::string& name) +{ + return (new kernel::routing::VivaldiZone(name))->get_iface(); } -} -} +} // namespace s4u + +} // namespace simgrid