X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/472b2aa318353674993dffd9792f1a155f579d6f..2ccf4cc115bbe75120d9264dc17ea7f7fed551e8:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index 75499987d4..577dc7a1dd 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -1,43 +1,49 @@ -/* Copyright (c) 2013-2016. 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. */ -#include - -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" - -#include "src/kernel/routing/NetCard.hpp" -#include "src/kernel/routing/VivaldiZone.hpp" +#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 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; -Coords::Coords(NetCard* netcard, const char* coordStr) +xbt::Extension Coords::EXTENSION_ID; + +Coords::Coords(NetPoint* netpoint, const std::string& coordStr) { - if (!Coords::EXTENSION_ID.valid()) - Coords::EXTENSION_ID = NetCard::extension_create(); + 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", netcard->cname()); + xbt_assert(string_values.size() == 3, "Coordinates of %s must have 3 dimensions", netpoint->get_cname()); - for (auto str : string_values) - coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s")); + for (auto const& str : string_values) + try { + coords.push_back(std::stod(str)); + } catch (std::invalid_argument const& ia) { + throw std::invalid_argument(std::string("Invalid coordinate: ") + ia.what()); + } coords.shrink_to_fit(); - netcard->extension_set(this); - XBT_DEBUG("Coords of %s %p: %s", netcard->cname(), netcard, coordStr); + netpoint->extension_set(this); + XBT_DEBUG("Coords of %s %p: %s", netpoint->get_cname(), netpoint, coordStr.c_str()); } -Coords::~Coords() = default; -}; // namespace vivaldi +} // namespace vivaldi static inline double euclidean_dist_comp(int index, std::vector* src, std::vector* dst) { @@ -47,68 +53,43 @@ static inline double euclidean_dist_comp(int index, std::vector* src, st return (src_coord - dst_coord) * (src_coord - dst_coord); } -static std::vector* getCoordsFromNetcard(NetCard* nc) +static std::vector* netpoint_get_coords(NetPoint* np) { - simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension(); + auto* coords = np->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", - (nc->isNetZone() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc); + (np->is_netzone() ? "Netzone" : (np->is_host() ? "Host" : "Router")), np->get_cname(), np); return &coords->coords; } -VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father, name) -{ -} -void VivaldiZone::setPeerLink(NetCard* netcard, double bw_in, double bw_out, double latency, const char* coord) +void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out) { - xbt_assert(netcard->netzone() == this, "Cannot add a peer link to a netcard that is not in this AS"); - - new simgrid::kernel::routing::vivaldi::Coords(netcard, coord); - - char* link_up = bprintf("link_%s_UP", netcard->cname()); - char* link_down = bprintf("link_%s_DOWN", netcard->cname()); - Link* linkUp = surf_network_model->createLink(link_up, bw_out, latency, SURF_LINK_SHARED); - Link* linkDown = surf_network_model->createLink(link_down, bw_in, latency, SURF_LINK_SHARED); - privateLinks_.insert({netcard->id(), {linkUp, linkDown}}); - - free(link_up); - free(link_down); + xbt_assert(netpoint->get_englobing_zone() == this, + "Cannot add a peer link to a netpoint that is not in this netzone"); + + 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::getLocalRoute(NetCard* src, NetCard* 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'[%d] '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id()); - - if (src->isNetZone()) { - char* srcName = bprintf("router_%s", src->cname()); - char* dstName = bprintf("router_%s", dst->cname()); - route->gw_src = simgrid::s4u::Engine::instance()->netcardByNameOrNull(srcName); - route->gw_dst = simgrid::s4u::Engine::instance()->netcardByNameOrNull(dstName); - xbt_free(srcName); - xbt_free(dstName); - } + XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); - /* Retrieve the private links */ - if (privateLinks_.find(src->id()) != privateLinks_.end()) { - std::pair info = privateLinks_.at(src->id()); - if (info.first) { - route->link_list->push_back(info.first); - if (lat) - *lat += info.first->latency(); - } - } - if (privateLinks_.find(dst->id()) != privateLinks_.end()) { - std::pair info = privateLinks_.at(dst->id()); - if (info.second) { - route->link_list->push_back(info.second); - if (lat) - *lat += info.second->latency(); - } + 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); } + StarZone::get_local_route(src, dst, route, lat); /* Compute the extra latency due to the euclidean distance if needed */ if (lat) { - std::vector* srcCoords = getCoordsFromNetcard(src); - std::vector* dstCoords = getCoordsFromNetcard(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)) + @@ -118,6 +99,15 @@ void VivaldiZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg *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