X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..63ebf4be4ca6a243a64c7ded8df9b96a9d28d3ff:/src/plugins/vm/VmLiveMigration.cpp diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index b584d69edc..8df22cda3f 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -3,15 +3,11 @@ /* 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 -#include -#include -#include -#include -#include -#include -#include -#include +#include "src/plugins/vm/VmLiveMigration.hpp" +#include "src/instr/instr_private.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VmHostExt.hpp" +#include "xbt/ex.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(vm_live_migration, "S4U virtual machines live migration"); @@ -31,7 +27,7 @@ void MigrationRx::operator()() bool received_finalize = false; std::string finalize_task_name = - std::string("__mig_stage3:") + vm_->getCname() + "(" + src_pm_->getCname() + "-" + dst_pm_->getCname() + ")"; + std::string("__mig_stage3:") + vm_->get_cname() + "(" + src_pm_->get_cname() + "-" + dst_pm_->get_cname() + ")"; while (not received_finalize) { std::string* payload = static_cast(mbox->get()); @@ -55,7 +51,7 @@ void MigrationRx::operator()() // Now the VM is running on the new host (the migration is completed) (even if the SRC crash) vm_->getImpl()->isMigrating = false; - XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", vm_->getCname(), src_pm_->getCname(), dst_pm_->getCname()); + XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", vm_->get_cname(), src_pm_->get_cname(), dst_pm_->get_cname()); if (TRACE_vm_is_enabled()) { static long long int counter = 0; @@ -63,22 +59,22 @@ void MigrationRx::operator()() counter++; // start link - container_t msg = simgrid::instr::Container::byName(vm_->getName()); + container_t msg = simgrid::instr::Container::byName(vm_->get_name()); simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key); // destroy existing container of this vm - simgrid::instr::Container::byName(vm_->getName())->removeFromParent(); + simgrid::instr::Container::byName(vm_->get_name())->removeFromParent(); // create new container on the new_host location - new simgrid::instr::Container(vm_->getCname(), "MSG_VM", simgrid::instr::Container::byName(dst_pm_->getName())); + new simgrid::instr::Container(vm_->get_cname(), "MSG_VM", simgrid::instr::Container::byName(dst_pm_->get_name())); // end link - msg = simgrid::instr::Container::byName(vm_->getName()); + msg = simgrid::instr::Container::byName(vm_->get_name()); simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->endEvent(msg, "M", key); } // Inform the SRC that the migration has been correctly performed std::string* payload = new std::string("__mig_stage4:"); - *payload = *payload + vm_->getCname() + "(" + src_pm_->getCname() + "-" + dst_pm_->getCname() + ")"; + *payload = *payload + vm_->get_cname() + "(" + src_pm_->get_cname() + "-" + dst_pm_->get_cname() + ")"; mbox_ctl->put(payload, 0); @@ -100,27 +96,27 @@ sg_size_t MigrationTx::sendMigrationData(sg_size_t size, int stage, int stage2_r { sg_size_t sent = size; std::string* msg = new std::string("__mig_stage"); - *msg = *msg + std::to_string(stage) + ":" + vm_->getCname() + "(" + src_pm_->getCname() + "-" + dst_pm_->getCname() + - ")"; + *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(comm->getRemains()); + sg_size_t remaining = static_cast(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; @@ -166,7 +162,7 @@ void MigrationTx::operator()() 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 @@ -189,7 +185,7 @@ void MigrationTx::operator()() 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"); @@ -226,7 +222,7 @@ void MigrationTx::operator()() 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); @@ -237,7 +233,7 @@ void MigrationTx::operator()() 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 */ @@ -338,32 +334,33 @@ void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm) simgrid::s4u::Host* src_pm = vm->getPm(); if (src_pm->isOff()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->getCname(), src_pm->getCname()); + 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()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->getCname(), dst_pm->getCname()); + 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->getCname()); + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->get_cname()); if (vm->getImpl()->isMigrating) - THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->getCname()); + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->get_cname()); vm->getImpl()->isMigrating = true; std::string rx_name = - std::string("__pr_mig_rx:") + vm->getCname() + "(" + src_pm->getCname() + "-" + dst_pm->getCname() + ")"; + std::string("__pr_mig_rx:") + vm->get_cname() + "(" + src_pm->get_cname() + "-" + dst_pm->get_cname() + ")"; std::string tx_name = - std::string("__pr_mig_tx:") + vm->getCname() + "(" + src_pm->getCname() + "-" + dst_pm->getCname() + ")"; + 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(new simgrid::vm::VmMigrationExt(simgrid::s4u::Actor::self(), rx, tx)); /* 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( - std::string("__mbox_mig_ctl:") + vm->getCname() + "(" + src_pm->getCname() + "-" + dst_pm->getCname() + ")"); + std::string("__mbox_mig_ctl:") + vm->get_cname() + "(" + src_pm->get_cname() + "-" + dst_pm->get_cname() + ")"); delete static_cast(mbox_ctl->get()); tx->join(); rx->join();