X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..b67343d6e9fc74fc159a51a48d0ea7d9a2374712:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index a6b4fc3708..5eb06947e5 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -1,16 +1,17 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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 - +#include "simgrid/kernel/routing/VivaldiZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" - -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/VivaldiZone.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" + +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); @@ -20,14 +21,14 @@ namespace routing { namespace vivaldi { simgrid::xbt::Extension Coords::EXTENSION_ID; -Coords::Coords(NetPoint* netpoint, std::string coordStr) +Coords::Coords(NetPoint* netpoint, const std::string& coordStr) { if (not Coords::EXTENSION_ID.valid()) Coords::EXTENSION_ID = NetPoint::extension_create(); std::vector string_values; boost::split(string_values, coordStr, boost::is_any_of(" ")); - xbt_assert(string_values.size() == 3, "Coordinates of %s must have 3 dimensions", netpoint->getCname()); + xbt_assert(string_values.size() == 3, "Coordinates of %s must have 3 dimensions", netpoint->get_cname()); for (auto const& str : string_values) try { @@ -38,7 +39,7 @@ Coords::Coords(NetPoint* netpoint, std::string coordStr) coords.shrink_to_fit(); netpoint->extension_set(this); - XBT_DEBUG("Coords of %s %p: %s", netpoint->getCname(), netpoint, coordStr.c_str()); + XBT_DEBUG("Coords of %s %p: %s", netpoint->get_cname(), netpoint, coordStr.c_str()); } }; // namespace vivaldi @@ -50,62 +51,64 @@ static inline double euclidean_dist_comp(int index, std::vector* src, st return (src_coord - dst_coord) * (src_coord - dst_coord); } -static std::vector* getCoordsFromNetpoint(NetPoint* np) +static std::vector* netpoint_get_coords(NetPoint* np) { simgrid::kernel::routing::vivaldi::Coords* coords = np->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", - (np->isNetZone() ? "Netzone" : (np->isHost() ? "Host" : "Router")), np->getCname(), np); + (np->is_netzone() ? "Netzone" : (np->is_host() ? "Host" : "Router")), np->get_cname(), np); return &coords->coords; } -VivaldiZone::VivaldiZone(NetZone* father, std::string name) : ClusterZone(father, name) +VivaldiZone::VivaldiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : ClusterZone(father, name, netmodel) { } -void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord) +void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, const std::string& coord) { - xbt_assert(netpoint->netzone() == this, "Cannot add a peer link to a netpoint that is not in this netzone"); + 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->getName() + "_UP"; - std::string link_down = "link_" + netpoint->getName() + "_DOWN"; - surf::LinkImpl* linkUp = surf_network_model->createLink(link_up, bw_out, 0, SURF_LINK_SHARED); - surf::LinkImpl* linkDown = surf_network_model->createLink(link_down, bw_in, 0, SURF_LINK_SHARED); - privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); + 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, bw_out, 0, s4u::Link::SharingPolicy::SHARED); + resource::LinkImpl* linkDown = network_model_->create_link(link_down, bw_in, 0, s4u::Link::SharingPolicy::SHARED); + private_links_.insert({netpoint->id(), {linkUp, linkDown}}); } -void VivaldiZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { - XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id()); + XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); - if (src->isNetZone()) { - std::string srcName = "router_" + src->getName(); - std::string dstName = "router_" + dst->getName(); - route->gw_src = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(srcName.c_str()); - route->gw_dst = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(dstName.c_str()); + 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 = privateLinks_.find(src->id()); - if (src_link != privateLinks_.end()) { - std::pair info = src_link->second; + 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); + route->link_list.push_back(info.first); if (lat) - *lat += info.first->latency(); + *lat += info.first->get_latency(); } } else { XBT_DEBUG("Source of private link (%u) doesn't exist", src->id()); } - auto dst_link = privateLinks_.find(dst->id()); - if (dst_link != privateLinks_.end()) { - std::pair info = dst_link->second; + 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); + route->link_list.push_back(info.second); if (lat) - *lat += info.second->latency(); + *lat += info.second->get_latency(); } } else { XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id()); @@ -113,8 +116,8 @@ void VivaldiZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba /* Compute the extra latency due to the euclidean distance if needed */ if (lat) { - std::vector* srcCoords = getCoordsFromNetpoint(src); - std::vector* dstCoords = getCoordsFromNetpoint(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)) +