X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48b5185227bbb7c55f30d6d1267ba333e5003acf..8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 34e525e4ff..d0c47f5f20 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -34,10 +34,10 @@ namespace simgrid {
 namespace surf {
 
 HostL07Model::HostL07Model() : HostModel() {
-  set_maxmin_system(new simgrid::kernel::lmm::System(true /* selective update */));
-  get_maxmin_system()->solve_fun = &simgrid::kernel::lmm::bottleneck_solve;
-  surf_network_model = new NetworkL07Model(this, get_maxmin_system());
-  surf_cpu_model_pm  = new CpuL07Model(this, get_maxmin_system());
+  auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */);
+  set_maxmin_system(maxmin_system);
+  surf_network_model = new NetworkL07Model(this, maxmin_system);
+  surf_cpu_model_pm  = new CpuL07Model(this, maxmin_system);
 }
 
 HostL07Model::~HostL07Model()
@@ -46,7 +46,8 @@ HostL07Model::~HostL07Model()
   delete surf_cpu_model_pm;
 }
 
-CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : CpuModel(), hostModel_(hmodel)
+CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
+    : CpuModel(Model::UpdateAlgo::Full), hostModel_(hmodel)
 {
   set_maxmin_system(sys);
 }
@@ -56,7 +57,8 @@ CpuL07Model::~CpuL07Model()
   set_maxmin_system(nullptr);
 }
 
-NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : NetworkModel(), hostModel_(hmodel)
+NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
+    : NetworkModel(Model::UpdateAlgo::Full), hostModel_(hmodel)
 {
   set_maxmin_system(sys);
   loopback_     = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
@@ -134,8 +136,8 @@ void HostL07Model::update_actions_state(double /*now*/, double delta)
   }
 }
 
-kernel::resource::Action* HostL07Model::executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
-                                                            double* bytes_amount, double rate)
+kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                         double* bytes_amount, double rate)
 {
   return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate);
 }
@@ -221,7 +223,7 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host
   host_list[1]    = dst;
   bytes_amount[1] = size;
 
-  return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate);
+  return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate);
 }
 
 Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host,  std::vector<double> *speedPerPstate, int core)
@@ -267,7 +269,7 @@ kernel::resource::Action* CpuL07::execution_start(double size)
   host_list[0] = getHost();
   flops_amount[0] = size;
 
-  return static_cast<CpuL07Model*>(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1);
+  return static_cast<CpuL07Model*>(model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);
 }
 
 kernel::resource::Action* CpuL07::sleep(double duration)
@@ -280,7 +282,8 @@ kernel::resource::Action* CpuL07::sleep(double duration)
   return action;
 }
 
-bool CpuL07::isUsed(){
+bool CpuL07::is_used()
+{
   return model()->get_maxmin_system()->constraint_used(constraint());
 }
 
@@ -299,8 +302,8 @@ void CpuL07::onSpeedChange() {
   Cpu::onSpeedChange();
 }
 
-
-bool LinkL07::isUsed(){
+bool LinkL07::is_used()
+{
   return model()->get_maxmin_system()->constraint_used(constraint());
 }