Merge branch 'model_types_rework_part1' into 'master'

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

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index de75a275e1a33fb5271df546304be284d22c5a2e..d735582f32adcfb56692461c5882bf617fcc6194 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -4,6 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "ptask_L07.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/resource/profile/Event.hpp"
 #include "surf/surf.hpp"
@@ -21,9 +23,10 @@ void surf_host_model_init_ptask_L07()
 {
   XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks.");
 
-  auto host_model = std::make_unique<simgrid::surf::HostL07Model>();
-  simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST,
-                                                         std::move(host_model), true);
+  auto host_model = std::make_shared<simgrid::surf::HostL07Model>();
+  simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, host_model,
+                                                         true);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
 }
 
 namespace simgrid {
@@ -34,16 +37,16 @@ HostL07Model::HostL07Model() : HostModel()
   auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */);
   set_maxmin_system(maxmin_system);
 
-  net_model_  = std::make_unique<NetworkL07Model>(this, maxmin_system);
-  auto engine = simgrid::kernel::EngineImpl::get_instance();
-  engine->add_model_ptask(simgrid::kernel::resource::Model::Type::NETWORK, net_model_.get(), true);
+  auto net_model = std::make_shared<NetworkL07Model>(this, maxmin_system);
+  auto engine    = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(simgrid::kernel::resource::Model::Type::NETWORK, net_model, true);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
 
-  cpu_model_ = std::make_unique<CpuL07Model>(this, maxmin_system);
-  engine->add_model_ptask(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_.get(), true);
+  auto cpu_model = std::make_shared<CpuL07Model>(this, maxmin_system);
+  engine->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model, true);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model);
 }
 
-HostL07Model::~HostL07Model() {}
-
 CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
     : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
 {