-/* Copyright (c) 2015-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2017. 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/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/plugins/vm/VmHostExt.hpp"
-#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_host_private.hpp"
#include "src/surf/cpu_cas01.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
namespace s4u {
VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount)
- : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, pm, coreAmount))
+ : VirtualMachine(name, pm, coreAmount, 0)
+{
+}
+
+VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount, size_t ramsize)
+ : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, pm, coreAmount, ramsize))
{
XBT_DEBUG("Create VM %s", name);
extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
if (TRACE_msg_vm_is_enabled()) {
- container_t host_container = PJ_container_get(pm->getCname());
- PJ_container_new(name, INSTR_MSG_VM, host_container);
+ container_t host_container = simgrid::instr::Container::byName(pm->getName());
+ new simgrid::instr::Container(name, "MSG_VM", host_container);
}
}
if (pm_ramsize && not pm_overcommit) { /* Only verify that we don't overcommit on need */
/* Retrieve the memory occupied by the VMs on that host. Yep, we have to traverse all VMs of all hosts for that */
long total_ramsize_of_vms = 0;
- for (simgrid::s4u::VirtualMachine* ws_vm : simgrid::vm::VirtualMachineImpl::allVms_)
+ for (simgrid::s4u::VirtualMachine* const& ws_vm : simgrid::vm::VirtualMachineImpl::allVms_)
if (pm == ws_vm->pimpl_vm_->getPm())
total_ramsize_of_vms += ws_vm->pimpl_vm_->getRamsize();
});
}
-bool VirtualMachine::isMigrating()
+void VirtualMachine::suspend()
{
- return pimpl_vm_ && pimpl_vm_->isMigrating;
+ smx_actor_t issuer = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); });
+ XBT_DEBUG("vm_suspend done");
}
-double VirtualMachine::getRamsize()
+
+void VirtualMachine::resume()
+{
+ pimpl_vm_->resume();
+}
+
+bool VirtualMachine::isMigrating()
{
- return pimpl_vm_->params_.ramsize;
+ return pimpl_vm_ && pimpl_vm_->isMigrating;
}
+
simgrid::s4u::Host* VirtualMachine::getPm()
{
return pimpl_vm_->getPm();
}
+
e_surf_vm_state_t VirtualMachine::getState()
{
return pimpl_vm_->getState();
}
+size_t VirtualMachine::getRamsize()
+{
+ return pimpl_vm_->getRamsize();
+}
+
+void VirtualMachine::setRamsize(size_t ramsize)
+{
+ pimpl_vm_->setRamsize(ramsize);
+}
+/** @brief Set a CPU bound for a given VM.
+ * @ingroup msg_VMs
+ *
+ * 1. Note that in some cases MSG_task_set_bound() may not intuitively work for VMs.
+ *
+ * For example,
+ * On PM0, there are Task1 and VM0.
+ * On VM0, there is Task2.
+ * Now we bound 75% to Task1\@PM0 and bound 25% to Task2\@VM0.
+ * Then,
+ * Task1\@PM0 gets 50%.
+ * Task2\@VM0 gets 25%.
+ * This is NOT 75% for Task1\@PM0 and 25% for Task2\@VM0, respectively.
+ *
+ * This is because a VM has the dummy CPU action in the PM layer. Putting a task on the VM does not affect the bound of
+ * the dummy CPU action. The bound of the dummy CPU action is unlimited.
+ *
+ * There are some solutions for this problem. One option is to update the bound of the dummy CPU action automatically.
+ * It should be the sum of all tasks on the VM. But, this solution might be costly, because we have to scan all tasks
+ * on the VM in share_resource() or we have to trap both the start and end of task execution.
+ *
+ * The current solution is to use setBound(), which allows us to directly set the bound of the dummy CPU action.
+ *
+ * 2. Note that bound == 0 means no bound (i.e., unlimited). But, if a host has multiple CPU cores, the CPU share of a
+ * computation task (or a VM) never exceeds the capacity of a CPU core.
+ */
+void VirtualMachine::setBound(double bound)
+{
+ simgrid::simix::kernelImmediate([this, bound]() { pimpl_vm_->setBound(bound); });
+}
/** @brief Retrieve a copy of the parameters of that VM/PM
* @details The ramsize and overcommit fields are used on the PM too */
void VirtualMachine::getParameters(vm_params_t params)