X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..1933a95e2b0981f030408fa642adc48877934c75:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 7122b9310e..87e2badd9e 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -8,6 +8,8 @@ #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_host_private.hpp" +#include // xbt_log_no_loc + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); simgrid::vm::VMModel* surf_vm_model = nullptr; @@ -91,13 +93,13 @@ double VMModel::nextOccuringEvent(double now) surf::Cpu* cpu = ws_vm->pimpl_cpu; xbt_assert(cpu, "cpu-less host"); - double solved_value = ws_vm->pimpl_vm_->action_->getVariable() - ->value; // this is X1 in comment above, what this VM got in the sharing on the PM + double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->get_value(); // this is X1 in comment above, what + // this VM got in the sharing on the PM XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->pimpl_vm_->getPm()->getCname()); xbt_assert(cpu->model() == surf_cpu_model_vm); lmm_system_t vcpu_system = cpu->model()->getMaxminSystem(); - lmm_update_constraint_bound(vcpu_system, cpu->constraint(), virt_overhead * solved_value); + vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value); } /* 2. Calculate resource share at the virtual machine layer. */ @@ -112,8 +114,8 @@ double VMModel::nextOccuringEvent(double now) ************/ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM, - int coreAmount) - : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount) + int coreAmount, size_t ramsize) + : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount), ramsize_(ramsize) { /* Register this VM to the list of all VMs */ allVms_.push_back(piface); @@ -122,14 +124,9 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ action_ = host_PM->pimpl_cpu->execution_start(0, coreAmount); - /* Initialize the VM parameters */ - params_.ramsize = 0; - XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname()); } -extern "C" int - xbt_log_no_loc; /* ugly pimpl to ensure that the debug info in the known issue below don't break the test */ /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */ VirtualMachineImpl::~VirtualMachineImpl() { @@ -174,18 +171,16 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) if (getState() != SURF_VM_STATE_RUNNING) THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->getCname()); if (issuer->host == piface_) - THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->cname(), piface_->getCname()); + THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->getCname(), piface_->getCname()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->getCname(), xbt_swag_size(process_list)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->getCname(), process_list.size()); action_->suspend(); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("suspend %s", smx_process->name.c_str()); - smx_process->suspend(issuer); + for (auto& smx_process : process_list) { + XBT_DEBUG("suspend %s", smx_process.name.c_str()); + smx_process.suspend(issuer); } XBT_DEBUG("suspend all processes on the VM done done"); @@ -198,16 +193,14 @@ void VirtualMachineImpl::resume() if (getState() != SURF_VM_STATE_SUSPENDED) THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->getCname()); - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->getCname(), xbt_swag_size(process_list)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->getCname(), process_list.size()); action_->resume(); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("resume %s", smx_process->cname()); - smx_process->resume(); + for (auto& smx_process : process_list) { + XBT_DEBUG("resume %s", smx_process.getCname()); + smx_process.resume(); } vmState_ = SURF_VM_STATE_RUNNING; @@ -241,15 +234,13 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->getCname(), stateName); } - xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->getCname(), xbt_swag_size(process_list)); + auto& process_list = piface_->extension()->process_list; + XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->getCname(), process_list.size()); - smx_actor_t smx_process; - smx_actor_t smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) { - XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process->cname(), smx_process->host->getCname(), - issuer->cname()); - SIMIX_process_kill(smx_process, issuer); + for (auto& smx_process : process_list) { + XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.getCname(), + smx_process.host->getCname(), issuer->getCname()); + SIMIX_process_kill(&smx_process, issuer); } setState(SURF_VM_STATE_DESTROYED); @@ -301,11 +292,6 @@ void VirtualMachineImpl::setPm(s4u::Host* destination) XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); } -sg_size_t VirtualMachineImpl::getRamsize() -{ - return params_.ramsize; -} - void VirtualMachineImpl::setBound(double bound) { action_->setBound(bound);