counter++;
// start link
- container_t msg = simgrid::instr::Container::byName(vm_->get_name());
- simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key);
+ container_t msg = simgrid::instr::Container::by_name(vm_->get_name());
+ simgrid::instr::Container::get_root()->get_link("VM_LINK")->start_event(msg, "M", key);
// destroy existing container of this vm
- simgrid::instr::Container::byName(vm_->get_name())->removeFromParent();
+ simgrid::instr::Container::by_name(vm_->get_name())->remove_from_parent();
// create new container on the new_host location
- new simgrid::instr::Container(vm_->get_cname(), "MSG_VM", simgrid::instr::Container::byName(dst_pm_->get_name()));
+ new simgrid::instr::Container(vm_->get_cname(), "VM", simgrid::instr::Container::by_name(dst_pm_->get_name()));
// end link
- msg = simgrid::instr::Container::byName(vm_->get_name());
- simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->endEvent(msg, "M", key);
+ msg = simgrid::instr::Container::by_name(vm_->get_name());
+ simgrid::instr::Container::get_root()->get_link("VM_LINK")->end_event(msg, "M", key);
}
// Inform the SRC that the migration has been correctly performed
std::string* payload = new std::string("__mig_stage4:");
}
}
-static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine* vm)
+static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine& vm)
{
- if (vm->getImpl()->isMigrating) {
- vm->extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
- vm->extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
- vm->extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();
- vm->getImpl()->isMigrating = false;
+ if (vm.getImpl()->isMigrating) {
+ vm.extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
+ vm.extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
+ vm.extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();
+ vm.getImpl()->isMigrating = false;
}
}
{
sg_vm_dirty_page_tracking_init();
simgrid::vm::VmMigrationExt::ensureVmMigrationExtInstalled();
- simgrid::s4u::VirtualMachine::onVmShutdown.connect(&onVirtualMachineShutdown);
+ simgrid::s4u::VirtualMachine::on_shutdown.connect(&onVirtualMachineShutdown);
}
/* Deprecated. Please use MSG_vm_create_migratable() instead */
{
simgrid::s4u::Host* src_pm = vm->getPm();
- if (src_pm->isOff())
+ if (src_pm->is_off())
THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->get_cname(),
src_pm->get_cname());
- if (dst_pm->isOff())
+ if (dst_pm->is_off())
THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->get_cname(), dst_pm->get_cname());
if (vm->getState() != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->get_cname());
/* wait until the migration have finished or on error has occurred */
XBT_DEBUG("wait for reception of the final ACK (i.e. migration has been correctly performed");
- simgrid::s4u::MailboxPtr mbox_ctl = simgrid::s4u::Mailbox::byName(
+ simgrid::s4u::MailboxPtr mbox_ctl = simgrid::s4u::Mailbox::by_name(
std::string("__mbox_mig_ctl:") + vm->get_cname() + "(" + src_pm->get_cname() + "-" + dst_pm->get_cname() + ")");
delete static_cast<std::string*>(mbox_ctl->get());
tx->join();