X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/184b805aa8767a3b01366fa5a0d2fe739538e4ca..b2f3150048cd87c9e16e251fea65c40221fd56ea:/src/kernel/routing/AsVivaldi.cpp

diff --git a/src/kernel/routing/AsVivaldi.cpp b/src/kernel/routing/AsVivaldi.cpp
index c922633842..915e8077f1 100644
--- a/src/kernel/routing/AsVivaldi.cpp
+++ b/src/kernel/routing/AsVivaldi.cpp
@@ -15,11 +15,42 @@ 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<s4u::Host, Coords> Coords::EXTENSION_ID;
 
-    return (src_coord-dst_coord)*(src_coord-dst_coord);
+Coords::Coords(s4u::Host* host, const char* coordStr)
+{
+  if (!Coords::EXTENSION_ID.valid()) {
+    Coords::EXTENSION_ID = s4u::Host::extension_create<Coords>();
+  }
+
+  unsigned int cursor;
+  char* str;
+
+  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());
+
+  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<Coords>(this);
+}
+Coords::~Coords()
+{
+  xbt_dynar_free(&coords);
+}
+}; // namespace vivaldi
+
+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);
+
+  return (src_coord - dst_coord) * (src_coord - dst_coord);
   }
 
   static xbt_dynar_t getCoordsFromNetcard(NetCard *nc)
@@ -27,16 +58,16 @@ namespace routing {
     xbt_dynar_t res = nullptr;
     char *tmp_name;
 
-    if(nc->isHost()){
-      tmp_name = bprintf("peer_%s", nc->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 = (xbt_dynar_t) host->extension(COORD_HOST_LEVEL);
+        res = host->extension<simgrid::kernel::routing::vivaldi::Coords>()->coords;
     }
     else if(nc->isRouter() || nc->isAS()){
-      tmp_name = bprintf("router_%s", nc->name());
+      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{
@@ -48,54 +79,53 @@ namespace routing {
 
     return res;
   }
-  AsVivaldi::AsVivaldi(const char *name)
-    : AsCluster(name)
+  AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name)
   {}
 
-AsVivaldi::~AsVivaldi() {}
-
-void AsVivaldi::getRouteAndLatency(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(), 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);
-  }
+  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->name().c_str(), src->id(), dst->name().c_str(),
+              dst->id());
+
+    if (src->isAS()) {
+      char* srcName = bprintf("router_%s", src->name().c_str());
+      char* dstName = bprintf("router_%s", dst->name().c_str());
+      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()) {
-    s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id());
-    if(info.linkUp) {
-      route->link_list->push_back(info.linkUp);
-      if (lat)
-        *lat += info.linkUp->getLatency();
+    /* Retrieve the private links */
+    if (privateLinks_.size() > src->id()) {
+      s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id());
+      if (info.linkUp) {
+        route->link_list->push_back(info.linkUp);
+        if (lat)
+          *lat += info.linkUp->latency();
+      }
     }
-  }
-  if (static_cast<int>(privateLinks_.size()) >dst->id()) {
-    s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id());
-    if(info.linkDown) {
-      route->link_list->push_back(info.linkDown);
-      if (lat)
-        *lat += info.linkDown->getLatency();
+    if (privateLinks_.size() > dst->id()) {
+      s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id());
+      if (info.linkDown) {
+        route->link_list->push_back(info.linkDown);
+        if (lat)
+          *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);
+    /* 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);
 
-    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(xbt_dynar_get_as(srcCoords, 2, double)) + fabs(xbt_dynar_get_as(dstCoords, 2, double));
 
-    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
+    }
 }
 
 }}}