optimize this vector traversal

[simgrid.git] / src / surf / ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 1d8e98f..60b919c 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -12,7 +12,6 @@
 #include "ptask_L07.hpp"
 
 #include "cpu_interface.hpp"
-#include "surf_routing.hpp"
 #include "xbt/lib.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
@@ -142,7 +141,6 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
       }
     }
   }
-  return;
 }
 
 Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
@@ -150,10 +148,12 @@ Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
   return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
 }
 
-
 L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
                      double *flops_amount, double *bytes_amount, double rate)
   : CpuAction(model, 1, 0)
+  , computationAmount_(flops_amount)
+  , communicationAmount_(bytes_amount)
+  , rate_(rate)
 {
   int nb_link = 0;
   int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
@@ -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<Link*> route;
 
-          routing_platf->getRouteAndLatency(hostList_->at(i)->pimpl_netcard, hostList_->at(j)->pimpl_netcard, &route,
-                                            &lat);
+          std::vector<Link*> route;
+          hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
           latency = MAX(latency, lat);
 
           for (auto link : route)
@@ -192,10 +191,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
       nb_used_host++;
 
   XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
-  this->computationAmount_ = flops_amount;
-  this->communicationAmount_ = bytes_amount;
   this->latency_ = latency;
-  this->rate_ = rate;
 
   this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
       (rate > 0 ? rate : -1.0),
@@ -214,10 +210,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(hostList_->at(i)->pimpl_netcard, hostList_->at(j)->pimpl_netcard, &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]);
@@ -411,8 +406,7 @@ void L07Action::updateBound()
         if (communicationAmount_[i * hostNb + j] > 0) {
           double lat = 0.0;
           std::vector<Link*> 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]);
         }