X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18117755285a374ec3d5830309c924f2830e3ba..befbbbe1fbb31663a8f91e24ce12df271cf4ae79:/src/kernel/routing/VivaldiZone.cpp diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index df9854721e..e2ec817fd7 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -1,13 +1,14 @@ -/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2017. 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 "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/kernel/routing/VivaldiZone.hpp" #include "src/surf/network_interface.hpp" @@ -17,23 +18,23 @@ namespace simgrid { namespace kernel { namespace routing { namespace vivaldi { -simgrid::xbt::Extension Coords::EXTENSION_ID; +simgrid::xbt::Extension Coords::EXTENSION_ID; -Coords::Coords(NetCard* netcard, const char* coordStr) +Coords::Coords(NetPoint* netpoint, const char* 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->cname()); for (auto str : string_values) coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s")); 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->cname(), netpoint, coordStr); } Coords::~Coords() = default; }; // namespace vivaldi @@ -46,49 +47,44 @@ 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* getCoordsFromNetpoint(NetPoint* np) { - simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension(); + simgrid::kernel::routing::vivaldi::Coords* coords = np->extension(); xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)", - (nc->isAS() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc); + (np->isNetZone() ? "Netzone" : (np->isHost() ? "Host" : "Router")), np->cname(), np); return &coords->coords; } -AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name) +VivaldiZone::VivaldiZone(NetZone* father, const char* name) : ClusterZone(father, name) { } -void AsVivaldi::setPeerLink(NetCard* netcard, double bw_in, double bw_out, double latency, const char* coord) +void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, const char* coord) { - xbt_assert(netcard->containingAS() == this, "Cannot add a peer link to a netcard that is not in this AS"); + xbt_assert(netpoint->netzone() == this, "Cannot add a peer link to a netpoint that is not in this netzone"); - new simgrid::kernel::routing::vivaldi::Coords(netcard, coord); + new simgrid::kernel::routing::vivaldi::Coords(netpoint, 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); + std::string link_up = "link_" + netpoint->name() + "_UP"; + std::string link_down = "link_" + netpoint->name() + "_DOWN"; + surf::LinkImpl* linkUp = surf_network_model->createLink(link_up.c_str(), bw_out, 0, SURF_LINK_SHARED); + surf::LinkImpl* linkDown = surf_network_model->createLink(link_down.c_str(), bw_in, 0, SURF_LINK_SHARED); + privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); } -void AsVivaldi::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) +void VivaldiZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) { 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->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); - xbt_free(dstName); + if (src->isNetZone()) { + std::string srcName = "router_" + src->name(); + std::string dstName = "router_" + dst->name(); + route->gw_src = simgrid::s4u::Engine::instance()->netpointByNameOrNull(srcName.c_str()); + route->gw_dst = simgrid::s4u::Engine::instance()->netpointByNameOrNull(dstName.c_str()); } /* Retrieve the private links */ if (privateLinks_.find(src->id()) != privateLinks_.end()) { - std::pair info = privateLinks_.at(src->id()); + std::pair info = privateLinks_.at(src->id()); if (info.first) { route->link_list->push_back(info.first); if (lat) @@ -96,7 +92,7 @@ void AsVivaldi::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t } } if (privateLinks_.find(dst->id()) != privateLinks_.end()) { - std::pair info = privateLinks_.at(dst->id()); + std::pair info = privateLinks_.at(dst->id()); if (info.second) { route->link_list->push_back(info.second); if (lat) @@ -106,8 +102,8 @@ void AsVivaldi::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t /* 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 = getCoordsFromNetpoint(src); + std::vector* dstCoords = getCoordsFromNetpoint(dst); double euclidean_dist = sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +