X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b32027d2deacc1dec0a2cf36bace8e716d2be7c1..2ac408d38b69174ce77cd78cedab6d2ef4ad93a6:/src/surf/ptask_L07.cpp
diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 1d8e98f4a6..f488f01e65 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -172,10 +172,9 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
if (bytes_amount[i * host_nb + j] > 0) {
double lat=0.0;
- std::vector route;
- routing_platf->getRouteAndLatency(hostList_->at(i)->pimpl_netcard, hostList_->at(j)->pimpl_netcard, &route,
- &lat);
+ std::vector route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
for (auto link : route)
@@ -214,10 +213,9 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- std::vector route;
- routing_platf->getRouteAndLatency(hostList_->at(i)->pimpl_netcard, hostList_->at(j)->pimpl_netcard, &route,
- nullptr);
+ std::vector route;
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
for (auto link : route)
lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]);
@@ -411,8 +409,7 @@ void L07Action::updateBound()
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
std::vector route;
- routing_platf->getRouteAndLatency(hostList_->at(i)->pimpl_netcard, hostList_->at(j)->pimpl_netcard, &route,
- &lat);
+ hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
}