Initialize CPU model for VMs in init_HL13

cpu_vm model is used by virtual machines only, create it when
initializing the VM model

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 9634c6f..c5e65c6 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -5,15 +5,34 @@
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "simgrid/Exception.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Exec.hpp"
+#include "simgrid/sg_config.hpp"
 #include "src/include/surf/surf.hpp"
 #include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
+#include "src/surf/cpu_cas01.hpp"
+#include "src/surf/cpu_ti.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_vm, ker_resource, "Virtual Machines, containing actors and mobile accross hosts");
 
 void surf_vm_model_init_HL13()
 {
+  auto cpu_optim = simgrid::config::get_value<std::string>("cpu/optim");
+  std::shared_ptr<simgrid::kernel::resource::CpuModel> cpu_model_vm;
+  if (cpu_optim == "TI") {
+    cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuTiModel>();
+  } else {
+    simgrid::kernel::resource::Model::UpdateAlgo algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL;
+    if (cpu_optim == "Lazy")
+      algo = simgrid::kernel::resource::Model::UpdateAlgo::LAZY;
+    cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>(algo);
+  }
+  simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_VM, cpu_model_vm,
+                                                         true);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm);
+
   auto vm_model = std::make_shared<simgrid::vm::VMModel>();
   simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::VM,
                                                          std::move(vm_model), true);

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index cd9544b..957c474 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -40,7 +40,7 @@ static simgrid::config::Flag<std::string>
 void surf_cpu_model_init_Cas01()
 {
   if (cpu_optim_opt == "TI") {
-    simgrid::kernel::resource::CpuTiModel::create_pm_vm_models();
+    simgrid::kernel::resource::CpuTiModel::create_pm_models();
     return;
   }
 
@@ -54,11 +54,6 @@ void surf_cpu_model_init_Cas01()
   simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm,
                                                          true);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
-
-  auto cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>(algo);
-  simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_VM, cpu_model_vm,
-                                                         true);
-  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm);
 }
 
 namespace simgrid {

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 6492de2..3c91c3e 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -268,16 +268,12 @@ int CpuTiProfile::binary_search(const std::vector<double>& array, double a)
  * Model *
  *********/
 
-void CpuTiModel::create_pm_vm_models()
+void CpuTiModel::create_pm_models()
 {
   auto cpu_model_pm = std::make_shared<CpuTiModel>();
   simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_PM, cpu_model_pm,
                                                          true);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_pm_model(cpu_model_pm);
-  auto cpu_model_vm = std::make_shared<CpuTiModel>();
-  simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::CPU_VM, cpu_model_vm,
-                                                         true);
-  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm);
 }
 
 CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL) {}

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 1b3af3e..e50d877 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -140,7 +140,7 @@ using CpuTiList = boost::intrusive::list<CpuTi, CpuTiListOptions>;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  static void create_pm_vm_models(); // Make both models be TI models
+  static void create_pm_models(); // Make CPU PM model
 
   CpuTiModel();
   CpuTiModel(const CpuTiModel&) = delete;