-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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(surf_vm, surf, "Logging specific to the SURF VM module");
+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()
+void surf_vm_model_init_HL13(simgrid::kernel::resource::CpuModel* cpu_pm_model)
{
- if (surf_cpu_model_vm != nullptr)
- surf_vm_model = new simgrid::vm::VMModel();
+ auto vm_model = std::make_shared<simgrid::vm::VMModel>();
+ vm_model->set_name("VM_HL13");
+
+ simgrid::kernel::EngineImpl::get_instance()->add_model(vm_model, {cpu_pm_model});
+ std::shared_ptr<simgrid::kernel::resource::CpuModel> cpu_model_vm;
+
+ auto cpu_optim = simgrid::config::get_value<std::string>("cpu/optim");
+ if (cpu_optim == "TI") {
+ cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuTiModel>();
+ cpu_model_vm->set_name("VmCpu_TI");
+ } else {
+ cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>();
+ cpu_model_vm->set_name("VmCpu_Cas01");
+ }
+ simgrid::kernel::EngineImpl::get_instance()->add_model(cpu_model_vm, {cpu_pm_model, vm_model.get()});
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_cpu_vm_model(cpu_model_vm);
}
namespace simgrid {
+
+template class xbt::Extendable<vm::VirtualMachineImpl>;
+
namespace vm {
/*************
* Callbacks *
}
}
-static void add_active_exec(s4u::Actor const&, s4u::Exec const& task)
+static void add_active_exec(s4u::Exec const& task)
{
const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
if (vm != nullptr) {
VirtualMachineImpl* vm_impl = vm->get_impl();
- vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
+ vm_impl->add_active_exec();
vm_impl->update_action_weight();
}
}
-static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task)
+static void remove_active_exec(s4u::Exec const& task)
{
const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
if (vm != nullptr) {
VirtualMachineImpl* vm_impl = vm->get_impl();
- vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
+ vm_impl->remove_active_exec();
vm_impl->update_action_weight();
}
}
{
const s4u::VirtualMachine* vm = get_vm_from_activity(act);
if (vm != nullptr) {
- VirtualMachineImpl *vm_impl = vm->get_impl();
- vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
+ VirtualMachineImpl* vm_impl = vm->get_impl();
+ vm_impl->add_active_exec();
vm_impl->update_action_weight();
}
}
{
const s4u::VirtualMachine* vm = get_vm_from_activity(act);
if (vm != nullptr) {
- VirtualMachineImpl *vm_impl = vm->get_impl();
- vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
+ VirtualMachineImpl* vm_impl = vm->get_impl();
+ vm_impl->remove_active_exec();
vm_impl->update_action_weight();
}
}
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);
/* iterate for all virtual machines */
for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) {
+ if (ws_vm->get_state() == s4u::VirtualMachine::state::SUSPENDED) // Ignore suspended VMs
+ continue;
+
const kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
- double solved_value =
- ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
- // this VM got in the sharing on the PM
+ // solved_value below is X1 in comment above: what this VM got in the sharing on the PM
+ 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;
}
/************
* The value for GUESTOS_NOISE corresponds to the cost of the global action associated to the VM. It corresponds to
* the cost of a VM running no tasks.
*/
- action_ = host_PM->pimpl_cpu->execution_start(0, core_amount);
+ action_ = physical_host_->pimpl_cpu->execution_start(0, core_amount_);
// It's empty for now, so it should not request resources in the PM
update_action_weight();
action_->suspend();
- for (auto& actor : actor_list_) {
+ foreach_actor([](auto& actor) {
XBT_DEBUG("suspend %s", actor.get_cname());
actor.suspend();
- }
+ });
XBT_DEBUG("suspend all actors on the VM done done");
action_->resume();
- for (auto& actor : actor_list_) {
+ foreach_actor([](auto& actor) {
XBT_DEBUG("resume %s", actor.get_cname());
actor.resume();
- }
+ });
vm_state_ = s4u::VirtualMachine::state::RUNNING;
}
void VirtualMachineImpl::shutdown(smx_actor_t issuer)
{
if (get_state() != s4u::VirtualMachine::state::RUNNING) {
- const char* stateName = "(unknown state)";
+ const char* stateName;
switch (get_state()) {
case s4u::VirtualMachine::state::CREATED:
stateName = "created, but not yet started";
XBT_DEBUG("shutdown VM %s, that contains %zu actors", piface_->get_cname(), get_actor_count());
- for (auto& actor : actor_list_) {
+ foreach_actor([issuer](auto& actor) {
XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", actor.get_cname(), actor.get_host()->get_cname(),
issuer->get_cname());
issuer->kill(&actor);
- }
+ });
set_state(s4u::VirtualMachine::state::DESTROYED);
/* update net_elm with that of the destination physical host */
piface_->set_netpoint(destination->get_netpoint());
+ /* Adapt the speed, pstate and other physical characteristics to the one of our new physical CPU */
+ piface_->pimpl_cpu->reset_vcpu(destination->pimpl_cpu);
+
physical_host_ = destination;
/* Update vcpu's action for the new pm */
/* create a cpu action bound to the pm model at the destination. */
- kernel::resource::CpuAction* new_cpu_action =
- static_cast<kernel::resource::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->core_amount_));
+ kernel::resource::CpuAction* new_cpu_action = destination->pimpl_cpu->execution_start(0, this->core_amount_);
if (action_->get_remains_no_update() > 0)
XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update());
void VirtualMachineImpl::set_bound(double bound)
{
user_bound_ = bound;
+ action_->set_user_bound(user_bound_);
update_action_weight();
}
-void VirtualMachineImpl::update_action_weight(){
+void VirtualMachineImpl::update_action_weight()
+{
/* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */
- int impact = std::min(active_tasks_, get_core_amount());
+ int impact = std::min(active_execs_, get_core_amount());
- XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", this, impact, active_tasks_);
+ XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %u)", this, impact, active_execs_);
if (impact > 0)
action_->set_sharing_penalty(1. / impact);
action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_));
}
-}
-}
+} // namespace vm
+} // namespace simgrid
