X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0c5b1ab11469128ad826610f54b1f0f332bd172..61e155ac26178e40e46c04728680a1cbd426cad4:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 0a64e685b7..c300f9424d 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -41,8 +41,24 @@ std::deque VirtualMachineImpl::allVms_; * 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; +const double virt_overhead = 1; // 0.95 + +static void hostStateChange(s4u::Host& host) +{ + if (host.isOff()) { // just turned off. + std::vector trash; + /* Find all VMs living on that host */ + for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_) + if (vm->getPm() == &host) + trash.push_back(vm); + for (s4u::VirtualMachine* vm : trash) + vm->pimpl_vm_->shutdown(SIMIX_process_self()); + } +} +VMModel::VMModel() +{ + s4u::Host::onStateChange.connect(hostStateChange); +} double VMModel::nextOccuringEvent(double now) { @@ -71,16 +87,14 @@ double VMModel::nextOccuringEvent(double now) **/ /* iterate for all virtual machines */ - for (s4u::VirtualMachine* ws_vm : VirtualMachineImpl::allVms_) { + for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) { 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 - XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->cname(), ws_vm->pimpl_vm_->getPm()->cname()); + XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->pimpl_vm_->getPm()->getCname()); - // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. - // cpu_cas01->constraint->bound = solved_value; 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); @@ -111,7 +125,7 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim /* Initialize the VM parameters */ params_.ramsize = 0; - XBT_VERB("Create VM(%s)@PM(%s)", piface->cname(), hostPM_->cname()); + XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname()); } extern "C" int @@ -126,21 +140,18 @@ VirtualMachineImpl::~VirtualMachineImpl() allVms_.erase(iter); /* dirty page tracking */ - unsigned int size = xbt_dict_size(dp_objs); + unsigned int size = dp_objs.size(); static bool already_warned = false; if (size > 0 && not already_warned) { - xbt_dict_cursor_t cursor = nullptr; - xbt_dict_cursor_first(dp_objs, &cursor); + auto front = dp_objs.begin(); XBT_WARN("Dirty page tracking: %u pending task(s) on a destroyed VM (first one is %s).\n" "If you don't understand why your task was not properly removed, please report that bug.\n" "This is a known bug if you turned the host off during the VM execution.\n" "Please remind us of that problem at some point: our code base is not ready to fix this harmless issue in " "2016, sorry.", - size, (xbt_log_no_loc ? "(name hidden)" : xbt_dict_cursor_get_key(cursor))); - xbt_dict_cursor_free(&cursor); + size, (xbt_log_no_loc ? "(name hidden)" : front->first.c_str())); already_warned = true; } - xbt_dict_free(&dp_objs); /* Free the cpu_action of the VM. */ XBT_ATTRIB_UNUSED int ret = action_->unref(); @@ -159,14 +170,14 @@ void VirtualMachineImpl::setState(e_surf_vm_state_t state) void VirtualMachineImpl::suspend(smx_actor_t issuer) { if (isMigrating) - THROWF(vm_error, 0, "Cannot suspend VM '%s': it is migrating", piface_->cname()); + THROWF(vm_error, 0, "Cannot suspend VM '%s': it is migrating", piface_->getCname()); if (getState() != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->cname()); + 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_->cname()); + THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->cname(), piface_->getCname()); xbt_swag_t process_list = piface_->extension()->process_list; - XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->getCname(), xbt_swag_size(process_list)); action_->suspend(); @@ -174,7 +185,7 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) 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); + smx_process->suspend(issuer); } XBT_DEBUG("suspend all processes on the VM done done"); @@ -185,10 +196,10 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) void VirtualMachineImpl::resume() { if (getState() != SURF_VM_STATE_SUSPENDED) - THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->cname()); + 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_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->getCname(), xbt_swag_size(process_list)); action_->resume(); @@ -196,7 +207,7 @@ void VirtualMachineImpl::resume() 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); + smx_process->resume(); } vmState_ = SURF_VM_STATE_RUNNING; @@ -227,16 +238,17 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) THROW_IMPOSSIBLE; break; } - XBT_VERB("Shuting down the VM %s even if it's not running but %s", piface_->cname(), stateName); + 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_->cname(), xbt_swag_size(process_list)); + XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->getCname(), xbt_swag_size(process_list)); 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()); + 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); } @@ -257,9 +269,9 @@ s4u::Host* VirtualMachineImpl::getPm() */ void VirtualMachineImpl::setPm(s4u::Host* destination) { - const char* vm_name = piface_->cname(); - const char* pm_name_src = hostPM_->cname(); - const char* pm_name_dst = destination->cname(); + const char* vm_name = piface_->getCname(); + const char* pm_name_src = hostPM_->getCname(); + const char* pm_name_dst = destination->getCname(); /* update net_elm with that of the destination physical host */ piface_->pimpl_netpoint = destination->pimpl_netpoint;