X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f5649e6da1087111b7201e30e59f6e80104984c..82f71f716643bf7c4ba1c63793439b753fcfa954:/src/surf/AsVivaldi.cpp

diff --git a/src/surf/AsVivaldi.cpp b/src/surf/AsVivaldi.cpp
index d773f1403b..5e310fa4dd 100644
--- a/src/surf/AsVivaldi.cpp
+++ b/src/surf/AsVivaldi.cpp
@@ -8,102 +8,86 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
 
-#define HOST_PEER(peername) bprintf("peer_%s", peername)
-#define ROUTER_PEER(peername) bprintf("router_%s", peername)
-#define LINK_PEER(peername) bprintf("link_%s", peername)
+namespace simgrid {
+namespace surf {
+  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);
 
-static inline double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
-  double src_coord, dst_coord;
+    return (src_coord-dst_coord)*(src_coord-dst_coord);
+  }
 
-  src_coord = xbt_dynar_get_as(src, index, double);
-  dst_coord = xbt_dynar_get_as(dst, index, double);
+  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;
+    }
 
-  return (src_coord-dst_coord)*(src_coord-dst_coord);
-}
+    xbt_assert(res,"No coordinate found for element '%s'",tmp_name);
+    free(tmp_name);
 
-namespace simgrid {
-namespace surf {
+    return res;
+  }
   AsVivaldi::AsVivaldi(const char *name)
     : AsCluster(name)
   {}
 
+AsVivaldi::~AsVivaldi() {}
+
 void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
 {
-  s_surf_parsing_link_up_down_t info;
-
-  XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",
-      src->name(), src->id(), dst->name(), dst->id());
+  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 = ROUTER_PEER(src->name());
-    char *dst_name = ROUTER_PEER(dst->name());
+    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);
   }
 
-  double euclidean_dist;
-  xbt_dynar_t src_ctn, dst_ctn;
-  char *tmp_src_name, *tmp_dst_name;
-
-  if(src->isHost()){
-    tmp_src_name = HOST_PEER(src->name());
-
-    if ((int)xbt_dynar_length(upDownLinks_)>src->id()) {
-      info = xbt_dynar_get_as(upDownLinks_, src->id(), s_surf_parsing_link_up_down_t);
-      if(info.link_up) { // link up
-        route->link_list->push_back(info.link_up);
-        if (lat)
-          *lat += static_cast<Link*>(info.link_up)->getLatency();
-      }
+  /* Retrieve the private links */
+  if ((int)xbt_dynar_length(privateLinks_) > src->id()) {
+    s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
+    if(info.linkUp) {
+      route->link_list->push_back(info.linkUp);
+      if (lat)
+        *lat += info.linkUp->getLatency();
     }
-    src_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(tmp_src_name)->extension(COORD_HOST_LEVEL);
-    if (src_ctn == nullptr)
-      src_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(src->name())->extension(COORD_HOST_LEVEL);
   }
-  else if(src->isRouter() || src->isAS()){
-    tmp_src_name = ROUTER_PEER(src->name());
-    src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL);
-  }
-  else{
-    THROW_IMPOSSIBLE;
-  }
-
-  if(dst->isHost()){
-    tmp_dst_name = HOST_PEER(dst->name());
-
-    if ((int)xbt_dynar_length(upDownLinks_)>dst->id()) {
-      info = xbt_dynar_get_as(upDownLinks_, dst->id(), s_surf_parsing_link_up_down_t);
-      if(info.link_down) { // link down
-        route->link_list->push_back(info.link_down);
-        if (lat)
-          *lat += static_cast<Link*>(info.link_down)->getLatency();
-      }
+  if ((int)xbt_dynar_length(privateLinks_)>dst->id()) {
+    s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, dst->id(), s_surf_parsing_link_up_down_t);
+    if(info.linkDown) {
+      route->link_list->push_back(info.linkDown);
+      if (lat)
+        *lat += info.linkDown->getLatency();
     }
-    dst_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(tmp_dst_name)
-      ->extension(COORD_HOST_LEVEL);
-    if (dst_ctn == nullptr)
-      dst_ctn = (xbt_dynar_t) simgrid::s4u::Host::by_name_or_create(dst->name())
-        ->extension(COORD_HOST_LEVEL);
-  }
-  else if(dst->isRouter() || dst->isAS()){
-    tmp_dst_name = ROUTER_PEER(dst->name());
-    dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL);
-  }
-  else{
-    THROW_IMPOSSIBLE;
   }
 
-  xbt_assert(src_ctn,"No coordinate found for element '%s'",tmp_src_name);
-  xbt_assert(dst_ctn,"No coordinate found for element '%s'",tmp_dst_name);
-  free(tmp_src_name);
-  free(tmp_dst_name);
+  /* 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);
 
-  euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
-                      + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 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));
 
-  if (lat){
     XBT_DEBUG("Updating latency %f += %f",*lat,euclidean_dist);
     *lat += euclidean_dist / 1000.0; //From .ms to .s
   }