-/* 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 <xbt/dynar.h>
+#include <boost/algorithm/string.hpp>
#include <simgrid/s4u/host.hpp>
#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");
namespace simgrid {
namespace kernel {
namespace routing {
- static inline double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
- double src_coord = xbt_dynar_get_as(src, index, double);
- double dst_coord = xbt_dynar_get_as(dst, index, double);
+namespace vivaldi {
+simgrid::xbt::Extension<NetCard, Coords> Coords::EXTENSION_ID;
- return (src_coord-dst_coord)*(src_coord-dst_coord);
- }
+Coords::Coords(NetCard* netcard, const char* coordStr)
+{
+ if (!Coords::EXTENSION_ID.valid())
+ Coords::EXTENSION_ID = NetCard::extension_create<Coords>();
- 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());
- 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 = (xbt_dynar_t) host->extension(COORD_HOST_LEVEL);
- }
- else if(nc->isRouter() || nc->isAS()){
- tmp_name = bprintf("router_%s", nc->name());
- res = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_name, COORD_ASR_LEVEL);
- }
- else{
- THROW_IMPOSSIBLE;
- }
+ std::vector<std::string> 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(res,"No coordinate found for element '%s'",tmp_name);
- free(tmp_name);
+ for (auto str : string_values)
+ coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s"));
+ coords.shrink_to_fit();
- return res;
- }
- AsVivaldi::AsVivaldi(const char *name)
- : AsCluster(name)
- {}
+ netcard->extension_set<Coords>(this);
+ XBT_DEBUG("Coords of %s %p: %s", netcard->cname(), netcard, coordStr);
+}
+Coords::~Coords() = default;
+}; // namespace vivaldi
-AsVivaldi::~AsVivaldi() {}
+static inline double euclidean_dist_comp(int index, std::vector<double>* src, std::vector<double>* dst)
+{
+ double src_coord = src->at(index);
+ double dst_coord = dst->at(index);
+
+ return (src_coord - dst_coord) * (src_coord - dst_coord);
+}
-void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
+static std::vector<double>* getCoordsFromNetcard(NetCard* nc)
{
- XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]", src->name(), src->id(), dst->name(), dst->id());
-
- if(src->isAS()) {
- char *src_name = bprintf("router_%s",src->name());
- char *dst_name = bprintf("router_%s",dst->name());
- route->gw_src = (sg_netcard_t) xbt_lib_get_or_null(as_router_lib, src_name, ROUTING_ASR_LEVEL);
- route->gw_dst = (sg_netcard_t) xbt_lib_get_or_null(as_router_lib, dst_name, ROUTING_ASR_LEVEL);
- xbt_free(src_name);
- xbt_free(dst_name);
+ simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension<simgrid::kernel::routing::vivaldi::Coords>();
+ 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::getLocalRoute(NetCard* src, NetCard* 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);
}
/* Retrieve the private links */
- if (static_cast<int>(privateLinks_.size()) > src->id()) {
+ if (privateLinks_.size() > src->id()) {
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->getLatency();
+ *lat += info.linkUp->latency();
}
}
- if (static_cast<int>(privateLinks_.size()) >dst->id()) {
+ if (privateLinks_.size() > dst->id()) {
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->getLatency();
+ *lat += info.linkDown->latency();
}
}
/* 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<double>* srcCoords = getCoordsFromNetcard(src);
+ std::vector<double>* 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
}
}
-
-}}}
+}
+}
+}
