#include <simgrid/plugins/live_migration.h>
#include <simgrid/s4u.hpp>
#include <simgrid/s4u/VirtualMachine.hpp>
+#include <simgrid/vm.h>
#include <src/instr/instr_private.hpp>
#include <src/plugins/vm/VirtualMachineImpl.hpp>
#include <src/plugins/vm/VmHostExt.hpp>
vm_->getImpl()->isMigrating = false;
XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", vm_->getCname(), src_pm_->getCname(), dst_pm_->getCname());
- if (TRACE_msg_vm_is_enabled()) {
+ if (TRACE_vm_is_enabled()) {
static long long int counter = 0;
std::string key = std::to_string(counter);
counter++;
simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key);
// destroy existing container of this vm
- container_t existing_container = simgrid::instr::Container::byName(vm_->getName());
- existing_container->removeFromParent();
- delete existing_container;
+ simgrid::instr::Container::byName(vm_->getName())->removeFromParent();
// create new container on the new_host location
new simgrid::instr::Container(vm_->getCname(), "MSG_VM", simgrid::instr::Container::byName(dst_pm_->getName()));
/* For the moment, intensity_rate is the percentage against the migration bandwidth */
- msg_vm_t vm = new simgrid::s4u::VirtualMachine(name, pm, coreAmount, static_cast<sg_size_t>(ramsize) * 1024 * 1024);
+ sg_vm_t vm = new simgrid::s4u::VirtualMachine(name, pm, coreAmount, static_cast<sg_size_t>(ramsize) * 1024 * 1024);
sg_vm_set_dirty_page_intensity(vm, dp_intensity / 100.0);
sg_vm_set_working_set_memory(vm, vm->getRamsize() * 0.9); // assume working set memory is 90% of ramsize
sg_vm_set_migration_speed(vm, mig_netspeed * 1024 * 1024.0);