-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-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 "simgrid/s4u/Actor.hpp"
-#include "src/instr/instr_private.hpp"
+#include "simgrid/vm.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/plugins/vm/VmHostExt.hpp"
#include "src/simix/smx_host_private.hpp"
#include "src/surf/cpu_cas01.hpp"
-#include <simgrid/vm.h>
-#include <src/plugins/vm/VmLiveMigration.hpp>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
-simgrid::xbt::signal<void(simgrid::s4u::VirtualMachine*)> simgrid::s4u::VirtualMachine::onVmShutdown;
namespace simgrid {
namespace s4u {
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_start;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_started;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_shutdown;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_suspend;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_resume;
VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount)
: VirtualMachine(name, pm, coreAmount, 1024)
/* Currently, a VM uses the network resource of its physical host */
pimpl_netpoint = pm->pimpl_netpoint;
+
// Create a VCPU for this VM
- surf::CpuCas01* sub_cpu = dynamic_cast<surf::CpuCas01*>(pm->pimpl_cpu);
+ std::vector<double>* speeds = new std::vector<double>();
+ for (int i = 0; i < pm->getPstatesCount(); i++)
+ speeds->push_back(pm->getPstateSpeed(i));
- pimpl_cpu = surf_cpu_model_vm->createCpu(this, sub_cpu->getSpeedPeakList(), coreAmount);
- if (sub_cpu->getPState() != 0)
- pimpl_cpu->setPState(sub_cpu->getPState());
+ surf_cpu_model_vm->createCpu(this, speeds, pm->getCoreCount());
+ if (pm->getPstate() != 0)
+ setPstate(pm->getPstate());
/* Make a process container */
extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
-
- if (TRACE_msg_vm_is_enabled()) {
- container_t host_container = instr::Container::byName(pm->getName());
- new instr::Container(name, "MSG_VM", host_container);
- instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("start", "0 0 1"); // start is blue
- instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("suspend", "1 0 0"); // suspend is red
- }
}
VirtualMachine::~VirtualMachine()
{
- onDestruction(*this);
+ on_destruction(*this);
- XBT_DEBUG("destroy %s", getCname());
+ XBT_DEBUG("destroy %s", get_cname());
/* FIXME: this is really strange that everything fails if the next line is removed.
* This is as if we shared these data with the PM, which definitely should not be the case...
/* Don't free these things twice: they are the ones of my physical host */
pimpl_netpoint = nullptr;
-
- if (TRACE_msg_vm_is_enabled()) {
- container_t container = simgrid::instr::Container::byName(getName());
- container->removeFromParent();
- delete container;
- }
}
void VirtualMachine::start()
{
- if (TRACE_msg_vm_is_enabled())
- simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("start");
+ on_start(*this);
- simgrid::simix::kernelImmediate([this]() {
+ simgrid::simix::simcall([this]() {
simgrid::vm::VmHostExt::ensureVmExtInstalled();
simgrid::s4u::Host* pm = this->pimpl_vm_->getPm();
total_ramsize_of_vms += ws_vm->getRamsize();
if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) {
- XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
- this->getCname(), pm->getCname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
- THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->getCname(),
- this->getCname());
+ XBT_WARN("cannot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
+ this->get_cname(), pm->get_cname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
+ THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->get_cname(),
+ this->get_cname());
}
}
this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
});
- if (TRACE_msg_vm_is_enabled())
- simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
+ on_started(*this);
}
void VirtualMachine::suspend()
{
+ on_suspend(*this);
smx_actor_t issuer = SIMIX_process_self();
- simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); });
- if (TRACE_msg_vm_is_enabled())
- simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("suspend");
- XBT_DEBUG("vm_suspend done");
+ simgrid::simix::simcall([this, issuer]() { pimpl_vm_->suspend(issuer); });
}
void VirtualMachine::resume()
{
pimpl_vm_->resume();
- if (TRACE_msg_vm_is_enabled())
- simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
+ on_resume(*this);
}
void VirtualMachine::shutdown()
{
smx_actor_t issuer = SIMIX_process_self();
- simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->shutdown(issuer); });
- onVmShutdown(this);
+ simgrid::simix::simcall([this, issuer]() { pimpl_vm_->shutdown(issuer); });
+ on_shutdown(*this);
}
void VirtualMachine::destroy()
void VirtualMachine::setPm(simgrid::s4u::Host* pm)
{
- simgrid::simix::kernelImmediate([this, pm]() { pimpl_vm_->setPm(pm); });
+ simgrid::simix::simcall([this, pm]() { pimpl_vm_->setPm(pm); });
}
e_surf_vm_state_t VirtualMachine::getState()
{
- return simgrid::simix::kernelImmediate([this]() { return pimpl_vm_->getState(); });
+ return simgrid::simix::simcall([this]() { return pimpl_vm_->getState(); });
}
size_t VirtualMachine::getRamsize()
*/
void VirtualMachine::setBound(double bound)
{
- simgrid::simix::kernelImmediate([this, bound]() { pimpl_vm_->setBound(bound); });
+ simgrid::simix::simcall([this, bound]() { pimpl_vm_->setBound(bound); });
}
} // namespace simgrid
/* **************************** Public C interface *************************** */
-SG_BEGIN_DECL()
/** @brief Create a new VM object with the default parameters
* A VM is treated as a host. The name of the VM must be unique among all hosts.
*/
const char* sg_vm_get_name(sg_vm_t vm)
{
- return vm->getCname();
+ return vm->get_cname();
}
/** @brief Get the physical host of a given VM. */
{
vm->destroy();
}
-SG_END_DECL()
