X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bbdf88838ab4ac0694163ff64fa8ed5344f555c..0c07b616d38841a028f8a34fe66394e232008b5e:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 3ca0d7c0c9..f488f01e65 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -159,9 +159,9 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
   int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
   double latency = 0.0;
 
-  this->netcardList_->reserve(host_nb);
+  this->hostList_->reserve(host_nb);
   for (int i = 0; i<host_nb; i++)
-    this->netcardList_->push_back(host_list[i]->pimpl_netcard);
+    this->hostList_->push_back(host_list[i]);
 
   /* Compute the number of affected resources... */
   if(bytes_amount != nullptr) {
@@ -172,9 +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<Link*> route;
 
-          routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], &route, &lat);
+          std::vector<Link*> route;
+          hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
           latency = MAX(latency, lat);
 
           for (auto link : route)
@@ -213,9 +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<Link*> route;
 
-        routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], &route, nullptr);
+        std::vector<Link*> 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]);
@@ -389,7 +389,7 @@ void LinkL07::setLatency(double value)
  **********/
 
 L07Action::~L07Action(){
-  delete netcardList_;
+  delete hostList_;
   free(communicationAmount_);
   free(computationAmount_);
 }
@@ -400,7 +400,7 @@ void L07Action::updateBound()
   double lat_bound = -1.0;
   int i, j;
 
-  int hostNb = netcardList_->size();
+  int hostNb = hostList_->size();
 
   if (communicationAmount_ != nullptr) {
     for (i = 0; i < hostNb; i++) {
@@ -409,7 +409,7 @@ void L07Action::updateBound()
         if (communicationAmount_[i * hostNb + j] > 0) {
           double lat = 0.0;
           std::vector<Link*> route;
-          routing_platf->getRouteAndLatency((*netcardList_)[i], (*netcardList_)[j], &route, &lat);
+          hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
 
           lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
         }