// start link
container_t msg = simgrid::instr::Container::byName(vm_->get_name());
- simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key);
+ simgrid::instr::Container::getRoot()->getLink("VM_LINK")->startEvent(msg, "M", key);
// destroy existing container of this vm
simgrid::instr::Container::byName(vm_->get_name())->removeFromParent();
// 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::byName(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);
+ simgrid::instr::Container::getRoot()->getLink("VM_LINK")->endEvent(msg, "M", key);
}
// Inform the SRC that the migration has been correctly performed
std::string* payload = new std::string("__mig_stage4:");
*msg = *msg + std::to_string(stage) + ":" + vm_->get_cname() + "(" + src_pm_->get_cname() + "-" +
dst_pm_->get_cname() + ")";
- double clock_sta = s4u::Engine::getClock();
+ double clock_sta = s4u::Engine::get_clock();
s4u::Activity* comm = nullptr;
try {
if (mig_speed > 0)
- comm = mbox->put_init(msg, size)->setRate(mig_speed)->wait(timeout);
+ comm = mbox->put_init(msg, size)->set_rate(mig_speed)->wait(timeout);
else
comm = mbox->put_async(msg, size)->wait();
} catch (xbt_ex& e) {
if (comm) {
- sg_size_t remaining = static_cast<sg_size_t>(comm->getRemains());
+ sg_size_t remaining = static_cast<sg_size_t>(comm->get_remaining());
XBT_VERB("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu", timeout, remaining, size);
sent -= remaining;
}
delete msg;
}
- double clock_end = s4u::Engine::getClock();
+ double clock_end = s4u::Engine::get_clock();
double duration = clock_end - clock_sta;
double actual_speed = size / duration;
sg_vm_start_dirty_page_tracking(vm_);
double computed_during_stage1 = 0;
- double clock_prev_send = s4u::Engine::getClock();
+ double clock_prev_send = s4u::Engine::get_clock();
try {
/* At stage 1, we do not need timeout. We have to send all the memory pages even though the duration of this
return;
}
- double clock_post_send = s4u::Engine::getClock();
+ double clock_post_send = s4u::Engine::get_clock();
mig_timeout -= (clock_post_send - clock_prev_send);
if (mig_timeout < 0) {
XBT_VERB("The duration of stage 1 exceeds the timeout value, skip stage 2");
break;
sg_size_t sent = 0;
- double clock_prev_send = s4u::Engine::getClock();
+ double clock_prev_send = s4u::Engine::get_clock();
try {
XBT_DEBUG("Stage 2, gonna send %llu", updated_size);
sent = sendMigrationData(updated_size, 2, stage2_round, mig_speed, mig_timeout);
sg_vm_stop_dirty_page_tracking(vm_);
return;
}
- double clock_post_send = s4u::Engine::getClock();
+ double clock_post_send = s4u::Engine::get_clock();
if (sent == updated_size) {
/* timeout did not happen */
}
}
-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 */
std::string("__pr_mig_tx:") + vm->get_cname() + "(" + src_pm->get_cname() + "-" + dst_pm->get_cname() + ")";
simgrid::s4u::ActorPtr rx =
- simgrid::s4u::Actor::createActor(rx_name.c_str(), dst_pm, simgrid::vm::MigrationRx(vm, dst_pm));
+ simgrid::s4u::Actor::create(rx_name.c_str(), dst_pm, simgrid::vm::MigrationRx(vm, dst_pm));
simgrid::s4u::ActorPtr tx =
- simgrid::s4u::Actor::createActor(tx_name.c_str(), src_pm, simgrid::vm::MigrationTx(vm, dst_pm));
+ simgrid::s4u::Actor::create(tx_name.c_str(), src_pm, simgrid::vm::MigrationTx(vm, dst_pm));
vm->extension_set<simgrid::vm::VmMigrationExt>(new simgrid::vm::VmMigrationExt(simgrid::s4u::Actor::self(), rx, tx));