/* 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());
- new simgrid::instr::Container(name, simgrid::instr::INSTR_MSG_VM, host_container);
+ container_t host_container = simgrid::instr::Container::byName(pm->getName());
+ new simgrid::instr::Container(name, "MSG_VM", host_container);
}
}
});
}
-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()
{
- return pimpl_vm_->params_.ramsize;
+ pimpl_vm_->resume();
}
+
+bool VirtualMachine::isMigrating()
+{
+ 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 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)