X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/096bd885787fc858262059ac8ad284ca3aa47397..df0464c2ffa61d7fab01a54732b01368886013aa:/src/kernel/routing/AsVivaldi.cpp diff --git a/src/kernel/routing/AsVivaldi.cpp b/src/kernel/routing/AsVivaldi.cpp index a3764cfe80..a7ff1f689a 100644 --- a/src/kernel/routing/AsVivaldi.cpp +++ b/src/kernel/routing/AsVivaldi.cpp @@ -1,13 +1,14 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2016. 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 #include #include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); @@ -16,80 +17,70 @@ namespace simgrid { namespace kernel { namespace routing { namespace vivaldi { -simgrid::xbt::Extension Coords::EXTENSION_ID; +simgrid::xbt::Extension Coords::EXTENSION_ID; -Coords::Coords(s4u::Host* host, const char* coordStr) +Coords::Coords(NetCard* netcard, const char* coordStr) { - if (!Coords::EXTENSION_ID.valid()) { - Coords::EXTENSION_ID = s4u::Host::extension_create(); - } + if (!Coords::EXTENSION_ID.valid()) + Coords::EXTENSION_ID = NetCard::extension_create(); - unsigned int cursor; - char* str; + 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_dynar_t ctn_str = xbt_str_split_str(coordStr, " "); - xbt_assert(xbt_dynar_length(ctn_str) == 3, "Coordinates of %s must have 3 dimensions", host->name().c_str()); + for (auto str : string_values) + coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s")); + coords.shrink_to_fit(); - this->coords = xbt_dynar_new(sizeof(double), nullptr); - xbt_dynar_foreach (ctn_str, cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(this->coords, &val); - } - xbt_dynar_free(&ctn_str); - xbt_dynar_shrink(this->coords, 0); - host->extension_set(this); -} -Coords::~Coords() -{ - xbt_dynar_free(&coords); + netcard->extension_set(this); + XBT_DEBUG("Coords of %s %p: %s", netcard->cname(), netcard, coordStr); } +Coords::~Coords() = default; }; // namespace vivaldi -static inline double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) +static inline double euclidean_dist_comp(int index, std::vector* src, std::vector* dst) { - double src_coord = xbt_dynar_get_as(src, index, double); - double dst_coord = xbt_dynar_get_as(dst, index, double); + double src_coord = src->at(index); + double dst_coord = dst->at(index); return (src_coord - dst_coord) * (src_coord - dst_coord); - } +} - static xbt_dynar_t getCoordsFromNetcard(NetCard *nc) - { - xbt_dynar_t res = nullptr; - char *tmp_name; - - if (nc->isHost()) { - tmp_name = bprintf("peer_%s", nc->name().c_str()); - simgrid::s4u::Host *host = simgrid::s4u::Host::by_name_or_null(tmp_name); - if (host == nullptr) - host = simgrid::s4u::Host::by_name_or_null(nc->name()); - if (host != nullptr) - res = host->extension()->coords; - } - else if(nc->isRouter() || nc->isAS()){ - tmp_name = bprintf("router_%s", nc->name().c_str()); - res = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_name, COORD_ASR_LEVEL); - } - else{ - THROW_IMPOSSIBLE; - } +static std::vector* getCoordsFromNetcard(NetCard* nc) +{ + simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension(); + xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", + (nc->isAS() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc); + return &coords->coords; +} +AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name) +{ +} + +void AsVivaldi::setPeerLink(NetCard* netcard, double bw_in, double bw_out, double latency, const char* coord) +{ + xbt_assert(netcard->containingAS() == this, "Cannot add a peer link to a netcard that is not in this AS"); - xbt_assert(res,"No coordinate found for element '%s'",tmp_name); - free(tmp_name); + new simgrid::kernel::routing::vivaldi::Coords(netcard, coord); - return res; - } - AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name) - {} + s_surf_parsing_link_up_down_t info; + char* link_up = bprintf("link_%s_UP", netcard->cname()); + char* link_down = bprintf("link_%s_DOWN", netcard->cname()); + info.linkUp = surf_network_model->createLink(link_up, bw_out, latency, SURF_LINK_SHARED); + info.linkDown = surf_network_model->createLink(link_down, bw_in, latency, SURF_LINK_SHARED); + privateLinks_.insert({netcard->id(), info}); -void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) + free(link_up); + free(link_down); +} + +void AsVivaldi::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) { - XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(), - dst->id()); + XBT_DEBUG("vivaldi getLocalRoute from '%s'[%d] '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id()); if (src->isAS()) { - char* srcName = bprintf("router_%s", src->name().c_str()); - char* dstName = bprintf("router_%s", dst->name().c_str()); + char* srcName = bprintf("router_%s", src->cname()); + char* dstName = bprintf("router_%s", dst->cname()); route->gw_src = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, srcName, ROUTING_ASR_LEVEL); route->gw_dst = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, dstName, ROUTING_ASR_LEVEL); xbt_free(srcName); @@ -97,17 +88,17 @@ void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb } /* Retrieve the private links */ - if (privateLinks_.size() > src->id()) { + if (privateLinks_.find(src->id()) != privateLinks_.end()) { s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id()); - if(info.linkUp) { + if (info.linkUp) { route->link_list->push_back(info.linkUp); if (lat) *lat += info.linkUp->latency(); } } - if (privateLinks_.size() >dst->id()) { + if (privateLinks_.find(dst->id()) != privateLinks_.end()) { s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id()); - if(info.linkDown) { + if (info.linkDown) { route->link_list->push_back(info.linkDown); if (lat) *lat += info.linkDown->latency(); @@ -115,16 +106,18 @@ void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb } /* Compute the extra latency due to the euclidean distance if needed */ - if (lat){ - xbt_dynar_t srcCoords = getCoordsFromNetcard(src); - xbt_dynar_t dstCoords = getCoordsFromNetcard(dst); + if (lat) { + std::vector* srcCoords = getCoordsFromNetcard(src); + std::vector* dstCoords = getCoordsFromNetcard(dst); - double euclidean_dist = sqrt (euclidean_dist_comp(0,srcCoords,dstCoords)+euclidean_dist_comp(1,srcCoords,dstCoords)) - + fabs(xbt_dynar_get_as(srcCoords, 2, double))+fabs(xbt_dynar_get_as(dstCoords, 2, double)); + double euclidean_dist = + sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) + + fabs(srcCoords->at(2)) + fabs(dstCoords->at(2)); - XBT_DEBUG("Updating latency %f += %f",*lat,euclidean_dist); - *lat += euclidean_dist / 1000.0; //From .ms to .s + XBT_DEBUG("Updating latency %f += %f", *lat, euclidean_dist); + *lat += euclidean_dist / 1000.0; // From .ms to .s } } - -}}} +} +} +}