X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a108fafefaa52133ff6d5dd671ac382ac4089252..0fd45b48c7de0646ac07216ca943a595cc9ade94:/src/plugins/vm/VmLiveMigration.cpp diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index 86b1958fa1..2cdd524126 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -43,7 +43,7 @@ void MigrationRx::operator()() /* Update the vm location */ /* precopy migration makes the VM temporally paused */ - xbt_assert(vm_->getState() == s4u::VirtualMachine::state::SUSPENDED); + xbt_assert(vm_->get_state() == s4u::VirtualMachine::state::SUSPENDED); /* Update the vm location and resume it */ vm_->set_pm(dst_pm_); @@ -134,7 +134,7 @@ void MigrationTx::operator()() { XBT_DEBUG("mig: tx_start"); - double host_speed = vm_->get_pm()->getSpeed(); + double host_speed = vm_->get_pm()->get_speed(); const sg_size_t ramsize = vm_->get_ramsize(); const double dp_rate = host_speed ? (sg_vm_get_migration_speed(vm_) * sg_vm_get_dirty_page_intensity(vm_)) / host_speed : 1; @@ -338,12 +338,13 @@ void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm) src_pm->get_cname()); 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() != simgrid::s4u::VirtualMachine::state::RUNNING) + if (vm->get_state() != simgrid::s4u::VirtualMachine::state::RUNNING) THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->get_cname()); if (vm->get_impl()->is_migrating_) THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->get_cname()); vm->get_impl()->is_migrating_ = true; + simgrid::s4u::VirtualMachine::on_migration_start(*vm); std::string rx_name = std::string("__pr_mig_rx:") + vm->get_cname() + "(" + src_pm->get_cname() + "-" + dst_pm->get_cname() + ")"; @@ -366,4 +367,5 @@ void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm) rx->join(); vm->get_impl()->is_migrating_ = false; + simgrid::s4u::VirtualMachine::on_migration_end(*vm); }