X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77db6c9bc8fa31f2915bbc77a1da62ce5e3c8da6..f5b4648bcb7aa3c1174e25c9f3cd28867b3b2871:/src/surf/cpu_cas01.cpp diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 3c2ee5cbfa..0d56ffe8ee 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -36,8 +36,6 @@ static simgrid::config::Flag *********/ void surf_cpu_model_init_Cas01() { - xbt_assert(surf_cpu_model_pm == nullptr, "CPU model already initialized. This should not happen."); - if (cpu_optim_opt == "TI") { simgrid::kernel::resource::CpuTiModel::create_pm_vm_models(); return; @@ -49,8 +47,8 @@ void surf_cpu_model_init_Cas01() else algo = simgrid::kernel::resource::Model::UpdateAlgo::FULL; - surf_cpu_model_pm = new simgrid::kernel::resource::CpuCas01Model(algo); - models_by_type[simgrid::kernel::resource::Model::Type::CPU_PM].push_back(surf_cpu_model_pm); + auto cpu_model_pm = new simgrid::kernel::resource::CpuCas01Model(algo); + models_by_type[simgrid::kernel::resource::Model::Type::CPU_PM].push_back(cpu_model_pm); auto cpu_model_vm = new simgrid::kernel::resource::CpuCas01Model(algo); models_by_type[simgrid::kernel::resource::Model::Type::CPU_VM].push_back(cpu_model_vm); } @@ -76,7 +74,6 @@ CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo) CpuCas01Model::~CpuCas01Model() { - surf_cpu_model_pm = nullptr; } Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& speed_per_pstate)