#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");
-simgrid::vm::VMModel* surf_vm_model = nullptr;
-
void surf_vm_model_init_HL13()
{
- if (surf_cpu_model_vm != nullptr)
- surf_vm_model = new simgrid::vm::VMModel();
+ 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);
}
namespace simgrid {
VMModel::VMModel()
{
- all_existing_models.push_back(this);
s4u::Host::on_state_change.connect(host_state_change);
s4u::Exec::on_start.connect(add_active_exec);
s4u::Exec::on_completion.connect(remove_active_exec);
double solved_value = ws_vm->get_impl()->get_action()->get_variable()->get_value();
XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
- xbt_assert(cpu->get_model() == surf_cpu_model_vm);
kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system();
vcpu_system->update_constraint_bound(cpu->get_constraint(), virt_overhead * solved_value);
}
- /* 2. Ready. Get the next occurring event */
- return surf_cpu_model_vm->next_occurring_event(now);
+ /* actual next occurring event is determined by VM CPU model at surf_solve */
+ return -1.0;
}
/************