X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98902509dba21a4817edab8fb2a8f69506a461a3..5d4bf7d1cd502bc979d98e35067872186f2a0a21:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index a986926012..aff790df98 100644
--- 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);
@@ -40,8 +39,6 @@ HostL07Model::HostL07Model() : HostModel() {
   maxminSystem_->solve_fun = &bottleneck_solve;
   surf_network_model = new NetworkL07Model(this,maxminSystem_);
   surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
-
-  routing_model_create();
 }
 
 HostL07Model::~HostL07Model() = default;
@@ -144,7 +141,6 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
       }
     }
   }
-  return;
 }
 
 Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list,
@@ -152,18 +148,20 @@ 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) */
   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) {
@@ -174,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<LinkImpl*> route;
+          hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
           latency = MAX(latency, lat);
 
           for (auto link : route)
@@ -193,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),
@@ -215,9 +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((*netcardList_)[i], (*netcardList_)[j], &route, nullptr);
+        std::vector<LinkImpl*> 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]);
@@ -250,8 +245,8 @@ Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host,  std::vector<double> *spee
   return new CpuL07(this, host, speedPerPstate, core);
 }
 
-Link* NetworkL07Model::createLink(const char* name, double bandwidth, double latency,
-                                  e_surf_link_sharing_policy_t policy)
+LinkImpl* NetworkL07Model::createLink(const char* name, double bandwidth, double latency,
+                                      e_surf_link_sharing_policy_t policy)
 {
   return new LinkL07(this, name, bandwidth, latency, policy);
 }
@@ -270,7 +265,7 @@ CpuL07::~CpuL07()=default;
 
 LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency,
                  e_surf_link_sharing_policy_t policy)
-    : Link(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
+    : LinkImpl(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
 {
   bandwidth_.peak = bandwidth;
   latency_.peak   = latency;
@@ -278,7 +273,7 @@ LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, dou
   if (policy == SURF_LINK_FATPIPE)
     lmm_constraint_shared(getConstraint());
 
-  Link::onCreation(this);
+  LinkImpl::onCreation(this);
 }
 
 Action *CpuL07::execution_start(double size)
@@ -391,7 +386,7 @@ void LinkL07::setLatency(double value)
  **********/
 
 L07Action::~L07Action(){
-  delete netcardList_;
+  delete hostList_;
   free(communicationAmount_);
   free(computationAmount_);
 }
@@ -402,7 +397,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++) {
@@ -410,8 +405,8 @@ 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);
+          std::vector<LinkImpl*> route;
+          hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
 
           lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
         }