X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b356ce9a510410f879eb3cd1b16b33856aebfdbe..183a6118a95c570b0c66695505dab7dbebc0c7b3:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 785ef94512..0a64e685b7 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -38,7 +38,9 @@ simgrid::xbt::signal onVmStateChange; std::deque VirtualMachineImpl::allVms_; /* In the real world, processes on the guest operating system will be somewhat degraded due to virtualization overhead. - * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. */ + * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. + * FIXME: add a configuration flag for this + */ // const double virt_overhead = 0.95; const double virt_overhead = 1; @@ -65,7 +67,7 @@ double VMModel::nextOccuringEvent(double now) * * Equation 1 was solved in the physical machine layer. * Equation 2 is solved in the virtual machine layer (here). - * X1 must be passed to the virtual machine laye as a constraint value. + * X1 must be passed to the virtual machine layer as a constraint value. **/ /* iterate for all virtual machines */ @@ -73,7 +75,8 @@ 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; + 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 XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->cname(), ws_vm->pimpl_vm_->getPm()->cname()); // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. @@ -84,9 +87,9 @@ double VMModel::nextOccuringEvent(double now) } /* 2. Calculate resource share at the virtual machine layer. */ - adjustWeightOfDummyCpuActions(); + ignoreEmptyVmInPmLMM(); - /* 3. Ready. Get the next occuring event */ + /* 3. Ready. Get the next occurring event */ return surf_cpu_model_vm->nextOccuringEvent(now); } @@ -94,15 +97,16 @@ double VMModel::nextOccuringEvent(double now) * Resource * ************/ -VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM) - : HostImpl(piface), hostPM_(host_PM) +VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM, + int coreAmount) + : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount) { /* 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. */ - /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ - action_ = host_PM->pimpl_cpu->execution_start(0); + /* 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; @@ -116,12 +120,15 @@ extern "C" int VirtualMachineImpl::~VirtualMachineImpl() { onVmDestruction(this); - allVms_.erase(find(allVms_.begin(), allVms_.end(), 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()) + allVms_.erase(iter); /* dirty page tracking */ unsigned int size = xbt_dict_size(dp_objs); static bool already_warned = false; - if (size > 0 && !already_warned) { + if (size > 0 && not already_warned) { xbt_dict_cursor_t cursor = nullptr; xbt_dict_cursor_first(dp_objs, &cursor); XBT_WARN("Dirty page tracking: %u pending task(s) on a destroyed VM (first one is %s).\n" @@ -163,7 +170,8 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) action_->suspend(); - smx_actor_t smx_process, smx_process_safe; + 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()); SIMIX_process_suspend(smx_process, issuer); @@ -184,7 +192,8 @@ void VirtualMachineImpl::resume() action_->resume(); - smx_actor_t smx_process, smx_process_safe; + 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()); SIMIX_process_resume(smx_process); @@ -202,19 +211,36 @@ void VirtualMachineImpl::resume() */ void VirtualMachineImpl::shutdown(smx_actor_t issuer) { - if (getState() != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "Cannot shutdown VM %s: it is not running", piface_->cname()); + if (getState() != SURF_VM_STATE_RUNNING) { + const char* stateName = "(unknown state)"; + switch (getState()) { + case SURF_VM_STATE_CREATED: + stateName = "created, but not yet started"; + break; + case SURF_VM_STATE_SUSPENDED: + stateName = "suspended"; + break; + case SURF_VM_STATE_DESTROYED: + stateName = "destroyed"; + break; + default: /* SURF_VM_STATE_RUNNING or unexpected values */ + THROW_IMPOSSIBLE; + break; + } + XBT_VERB("Shuting down the VM %s even if it's not running but %s", piface_->cname(), stateName); + } xbt_swag_t process_list = piface_->extension()->process_list; XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->cname(), xbt_swag_size(process_list)); - smx_actor_t smx_process, smx_process_safe; + 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", smx_process->cname()); SIMIX_process_kill(smx_process, issuer); } - setState(SURF_VM_STATE_CREATED); + setState(SURF_VM_STATE_DESTROYED); /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */ } @@ -242,17 +268,15 @@ void VirtualMachineImpl::setPm(s4u::Host* destination) /* Update vcpu's action for the new pm */ /* create a cpu action bound to the pm model at the destination. */ - surf::CpuAction* new_cpu_action = static_cast(destination->pimpl_cpu->execution_start(0)); + surf::CpuAction* new_cpu_action = + static_cast(destination->pimpl_cpu->execution_start(0, this->coreAmount_)); - surf::Action::State state = action_->getState(); - if (state != surf::Action::State::done) - XBT_CRITICAL("FIXME: may need a proper handling, %d", static_cast(state)); if (action_->getRemainsNoUpdate() > 0) XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate()); /* keep the bound value of the cpu action of the VM. */ double old_bound = action_->getBound(); - if (old_bound != 0) { + if (old_bound > 0) { XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst); new_cpu_action->setBound(old_bound); }