X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7c05e186c0c2c4555d127909c1898f0668c050c..82f71f716643bf7c4ba1c63793439b753fcfa954:/src/surf/AsVivaldi.cpp diff --git a/src/surf/AsVivaldi.cpp b/src/surf/AsVivaldi.cpp index 682afe3f4e..5e310fa4dd 100644 --- a/src/surf/AsVivaldi.cpp +++ b/src/surf/AsVivaldi.cpp @@ -47,6 +47,8 @@ namespace surf { : AsCluster(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()); @@ -63,18 +65,18 @@ void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb /* 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.link_up) { - route->link_list.push_back(info.link_up); + if(info.linkUp) { + route->link_list->push_back(info.linkUp); if (lat) - *lat += info.link_up->getLatency(); + *lat += info.linkUp->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.link_down) { - route->link_list.push_back(info.link_down); + if(info.linkDown) { + route->link_list->push_back(info.linkDown); if (lat) - *lat += info.link_down->getLatency(); + *lat += info.linkDown->getLatency(); } }