/* 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/Exception.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.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/plugins/vm/VirtualMachineImpl.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");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_vm, ker_resource, "Virtual Machines, containing actors and mobile across hosts");
void surf_vm_model_init_HL13(simgrid::kernel::resource::CpuModel* cpu_pm_model)
{
auto vm_model = std::make_shared<simgrid::vm::VMModel>("VM_HL13");
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
- simgrid::kernel::EngineImpl::get_instance()->add_model(vm_model, {cpu_pm_model});
+ engine->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");
} else {
cpu_model_vm = std::make_shared<simgrid::kernel::resource::CpuCas01Model>("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);
+ engine->add_model(cpu_model_vm, {cpu_pm_model, vm_model.get()});
+ engine->get_netzone_root()->set_cpu_vm_model(cpu_model_vm);
}
namespace simgrid {
template class xbt::Extendable<vm::VirtualMachineImpl>;
namespace vm {
-/*************
- * Callbacks *
- *************/
-xbt::signal<void(VirtualMachineImpl&)> VirtualMachineImpl::on_creation;
-xbt::signal<void(VirtualMachineImpl const&)> VirtualMachineImpl::on_destruction;
/*********
* Model *
{
const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
if (vm != nullptr) {
- VirtualMachineImpl* vm_impl = vm->get_impl();
+ VirtualMachineImpl* vm_impl = vm->get_vm_impl();
vm_impl->add_active_exec();
vm_impl->update_action_weight();
}
{
const s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
if (vm != nullptr) {
- VirtualMachineImpl* vm_impl = vm->get_impl();
+ VirtualMachineImpl* vm_impl = vm->get_vm_impl();
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();
+ VirtualMachineImpl* vm_impl = vm->get_vm_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();
+ VirtualMachineImpl* vm_impl = vm->get_vm_impl();
vm_impl->remove_active_exec();
vm_impl->update_action_weight();
}
}
-VMModel::VMModel(std::string name) : HostModel(name)
+VMModel::VMModel(const std::string& name) : HostModel(name)
{
s4u::Host::on_state_change.connect(host_state_change);
s4u::Exec::on_start.connect(add_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
+ if (ws_vm->get_state() == s4u::VirtualMachine::State::SUSPENDED) // Ignore suspended VMs
continue;
- const kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
+ const kernel::resource::CpuImpl* cpu = ws_vm->get_cpu();
// 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();
+ double solved_value = ws_vm->get_vm_impl()->get_action()->get_rate();
XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system();
* Resource *
************/
-VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM,
- int core_amount, size_t ramsize)
- : HostImpl(piface), physical_host_(host_PM), core_amount_(core_amount), ramsize_(ramsize)
+VirtualMachineImpl::VirtualMachineImpl(const std::string& name, s4u::VirtualMachine* piface,
+ simgrid::s4u::Host* host_PM, int core_amount, size_t ramsize)
+ : HostImpl(name, piface), piface_(piface), physical_host_(host_PM), core_amount_(core_amount), ramsize_(ramsize)
{
/* Register this VM to the list of all VMs */
allVms_.push_back(piface);
-
/* We create cpu_action corresponding to a VM process on the host operating system. */
/* TODO: we have to periodically input GUESTOS_NOISE to the system? how ?
* 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_ = physical_host_->pimpl_cpu->execution_start(0, core_amount_);
+ action_ = physical_host_->get_cpu()->execution_start(0, core_amount_);
// It's empty for now, so it should not request resources in the PM
update_action_weight();
- XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname());
- on_creation(*this);
+ XBT_VERB("Create VM(%s)@PM(%s)", name.c_str(), physical_host_->get_cname());
}
/** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */
-VirtualMachineImpl::~VirtualMachineImpl()
+void VirtualMachineImpl::vm_destroy()
{
- on_destruction(*this);
+ s4u::VirtualMachine::on_destruction(*piface_);
/* I was already removed from the allVms set if the VM was destroyed cleanly */
auto iter = find(allVms_.begin(), allVms_.end(), piface_);
if (iter != allVms_.end())
void VirtualMachineImpl::suspend(smx_actor_t issuer)
{
- if (get_state() != s4u::VirtualMachine::state::RUNNING)
+ if (vm_state_ != s4u::VirtualMachine::State::RUNNING)
throw VmFailureException(XBT_THROW_POINT,
xbt::string_printf("Cannot suspend VM %s: it is not running.", piface_->get_cname()));
if (issuer->get_host() == piface_)
XBT_DEBUG("suspend all actors on the VM done done");
- vm_state_ = s4u::VirtualMachine::state::SUSPENDED;
+ vm_state_ = s4u::VirtualMachine::State::SUSPENDED;
}
void VirtualMachineImpl::resume()
{
- if (get_state() != s4u::VirtualMachine::state::SUSPENDED)
+ if (vm_state_ != s4u::VirtualMachine::State::SUSPENDED)
throw VmFailureException(XBT_THROW_POINT,
xbt::string_printf("Cannot resume VM %s: it was not suspended", piface_->get_cname()));
actor.resume();
});
- vm_state_ = s4u::VirtualMachine::state::RUNNING;
+ vm_state_ = s4u::VirtualMachine::State::RUNNING;
}
/** @brief Power off a VM.
*/
void VirtualMachineImpl::shutdown(smx_actor_t issuer)
{
- if (get_state() != s4u::VirtualMachine::state::RUNNING) {
- const char* stateName;
- switch (get_state()) {
- case s4u::VirtualMachine::state::CREATED:
- stateName = "created, but not yet started";
- break;
- case s4u::VirtualMachine::state::SUSPENDED:
- stateName = "suspended";
- break;
- case s4u::VirtualMachine::state::DESTROYED:
- stateName = "destroyed";
- break;
- default: /* SURF_VM_STATE_RUNNING or unexpected values */
- THROW_IMPOSSIBLE;
- }
- XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
- }
+ if (vm_state_ != s4u::VirtualMachine::State::RUNNING)
+ XBT_VERB("Shutting down the VM %s even if it's not running but in state %s", piface_->get_cname(),
+ s4u::VirtualMachine::to_c_str(get_state()));
XBT_DEBUG("shutdown VM %s, that contains %zu actors", piface_->get_cname(), get_actor_count());
issuer->kill(&actor);
});
- set_state(s4u::VirtualMachine::state::DESTROYED);
+ set_state(s4u::VirtualMachine::State::DESTROYED);
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
}
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);
+ piface_->get_cpu()->reset_vcpu(destination->get_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 = destination->pimpl_cpu->execution_start(0, this->core_amount_);
+ kernel::resource::CpuAction* new_cpu_action = destination->get_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());
