X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd6ec43c6ac9b59d17c00970e44e245dfd62bbcc..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/ptask_L07.cpp?ds=sidebyside diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 357dd10ddc..853007776f 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -36,7 +36,7 @@ void surf_host_model_init_ptask_L07() XBT_CINFO(xbt_cfg, "Switching to the L07 model to handle parallel tasks."); xbt_assert(cfg_ptask_solver != "maxmin", "Invalid configuration. Cannot use maxmin solver with parallel tasks."); - auto* system = simgrid::kernel::lmm::System::build(cfg_ptask_solver, true /* selective update */); + auto* system = simgrid::kernel::lmm::System::build(cfg_ptask_solver.get(), true /* selective update */); auto host_model = std::make_shared("Host_Ptask", system); auto* engine = simgrid::kernel::EngineImpl::get_instance(); engine->add_model(host_model); @@ -57,6 +57,8 @@ HostL07Model::HostL07Model(const std::string& name, lmm::System* sys) : HostMode auto cpu_model = std::make_shared("Cpu_Ptask", this, sys); engine->add_model(cpu_model); engine->get_netzone_root()->set_cpu_pm_model(cpu_model); + + surf_disk_model_init_S19(); } CpuL07Model::CpuL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys) @@ -228,7 +230,7 @@ L07Action::L07Action(Model* model, const std::vector& host_list, con update_bound(); } -Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool /* streamed */) { std::vector host_list = {src, dst}; const auto* flops_amount = new double[2]();