-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* 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/simix/ActorImpl.hpp"
#include "src/simix/smx_host_private.hpp"
+#include <xbt/asserts.h> // 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;
}
}
-namespace simgrid {
-namespace vm {
/*************
* Callbacks *
*************/
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmCreation;
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmDestruction;
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmStateChange;
+simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> simgrid::vm::VirtualMachineImpl::onVmCreation;
+simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> simgrid::vm::VirtualMachineImpl::onVmDestruction;
+simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> simgrid::vm::VirtualMachineImpl::onVmStateChange;
+namespace simgrid {
+namespace vm {
/*********
* Model *
*********/
if (vm->getPm() == &host)
trash.push_back(vm);
for (s4u::VirtualMachine* vm : trash)
- vm->pimpl_vm_->shutdown(SIMIX_process_self());
+ vm->shutdown();
}
}
VMModel::VMModel()
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->getCname(), ws_vm->pimpl_vm_->getPm()->getCname());
+ double solved_value = ws_vm->getImpl()->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->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);
+ kernel::lmm::System* vcpu_system = cpu->model()->getMaxminSystem();
+ vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value);
}
/* 2. Calculate resource share at the virtual machine layer. */
************/
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);
/* 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());
+ onVmCreation(this);
}
-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()
{
if (iter != allVms_.end())
allVms_.erase(iter);
- /* dirty page tracking */
- unsigned int size = dp_objs.size();
- static bool already_warned = false;
- if (size > 0 && not already_warned) {
- 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)" : front->first.c_str()));
- already_warned = true;
- }
-
/* Free the cpu_action of the VM. */
XBT_ATTRIB_UNUSED int ret = action_->unref();
xbt_assert(ret == 1, "Bug: some resource still remains");
{
vmState_ = state;
}
+
void VirtualMachineImpl::suspend(smx_actor_t issuer)
{
- if (isMigrating)
- 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_->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<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->getCname(), xbt_swag_size(process_list));
+ auto& process_list = piface_->extension<simgrid::simix::Host>()->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");
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<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->getCname(), xbt_swag_size(process_list));
+ auto& process_list = piface_->extension<simgrid::simix::Host>()->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;
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<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->getCname(), xbt_swag_size(process_list));
+ auto& process_list = piface_->extension<simgrid::simix::Host>()->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);
surf::CpuAction* new_cpu_action =
static_cast<surf::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->coreAmount_));
- if (action_->getRemainsNoUpdate() > 0)
- XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate());
+ if (action_->get_remains_no_update() > 0)
+ XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update());
/* keep the bound value of the cpu action of the VM. */
- double old_bound = action_->getBound();
+ double old_bound = action_->get_bound();
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);
+ new_cpu_action->set_bound(old_bound);
}
XBT_ATTRIB_UNUSED int ret = action_->unref();
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);
-}
-
-void VirtualMachineImpl::getParams(vm_params_t params)
-{
- *params = params_;
+ action_->set_bound(bound);
}
-void VirtualMachineImpl::setParams(vm_params_t params)
-{
- /* may check something here. */
- params_ = *params;
-}
}
}
