X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d76121aad365cdeda0c0575afb192b642775197..4ee768b7c404f66fb8b45e919a2ad9f7dc795bdc:/src/plugins/vm/VirtualMachineImpl.cpp?ds=sidebyside diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index b662d97fd0..803ec9fbfc 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -6,7 +6,6 @@ #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/include/surf/surf.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "xbt/asserts.h" // xbt_log_no_loc @@ -145,7 +144,10 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim 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 ? */ + /* 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_ = host_PM->pimpl_cpu->execution_start(0, core_amount); // It's empty for now, so it should not request resources in the PM @@ -173,7 +175,7 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) { if (get_state() != s4u::VirtualMachine::state::RUNNING) THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->get_cname()); - if (issuer->host_ == piface_) + if (issuer->get_host() == piface_) THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(), piface_->get_cname()); @@ -231,7 +233,6 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) break; default: /* SURF_VM_STATE_RUNNING or unexpected values */ THROW_IMPOSSIBLE; - break; } XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName); } @@ -240,7 +241,7 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) for (auto& smx_process : process_list_) { XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.get_cname(), - smx_process.host_->get_cname(), issuer->get_cname()); + smx_process.get_host()->get_cname(), issuer->get_cname()); issuer->kill(&smx_process); }