X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4485d715fa3a090c1dd38def83ab8239feebecb3..bbe1883648093b16f04fc6b017ff745ffa22de5f:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 2d0b97d79a..51fae17378 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -4,11 +4,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "simgrid/Exception.hpp" +#include "simgrid/s4u/Exec.hpp" #include "src/include/surf/surf.hpp" -#include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" -#include "xbt/asserts.h" // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); @@ -25,9 +24,9 @@ namespace vm { /************* * Callbacks * *************/ -simgrid::xbt::signal VirtualMachineImpl::on_creation; -simgrid::xbt::signal VirtualMachineImpl::on_destruction; -simgrid::xbt::signal VirtualMachineImpl::on_state_change; +xbt::signal VirtualMachineImpl::on_creation; +xbt::signal VirtualMachineImpl::on_destruction; + /********* * Model * *********/ @@ -40,7 +39,7 @@ std::deque VirtualMachineImpl::allVms_; */ const double virt_overhead = 1; // 0.95 -static void hostStateChange(s4u::Host& host) +static void host_state_change(s4u::Host const& host) { if (not host.is_on()) { // just turned off. std::vector trash; @@ -53,21 +52,45 @@ static void hostStateChange(s4u::Host& host) } } -static void addActiveTask(kernel::activity::ActivityImplPtr exec) +static void add_active_exec(s4u::Actor const&, s4u::Exec const& task) +{ + s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + if (vm != nullptr) { + VirtualMachineImpl* vm_impl = vm->get_impl(); + vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1; + vm_impl->update_action_weight(); + } +} + +static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task) +{ + s4u::VirtualMachine* vm = dynamic_cast(task.get_host()); + if (vm != nullptr) { + VirtualMachineImpl* vm_impl = vm->get_impl(); + vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1; + vm_impl->update_action_weight(); + } +} + +static s4u::VirtualMachine* get_vm_from_activity(kernel::activity::ActivityImpl const& act) { - s4u::VirtualMachine* vm = - dynamic_cast(boost::static_pointer_cast(exec)->host_); + auto* exec = dynamic_cast(&act); + return exec != nullptr ? dynamic_cast(exec->get_host()) : nullptr; +} + +static void add_active_activity(kernel::activity::ActivityImpl const& act) +{ + s4u::VirtualMachine* vm = get_vm_from_activity(act); if (vm != nullptr) { VirtualMachineImpl *vm_impl = vm->get_impl(); vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1; - vm_impl->update_action_weight(); + vm_impl->update_action_weight(); } } -static void removeActiveTask(kernel::activity::ActivityImplPtr exec) +static void remove_active_activity(kernel::activity::ActivityImpl const& act) { - s4u::VirtualMachine* vm = - dynamic_cast(boost::static_pointer_cast(exec)->host_); + s4u::VirtualMachine* vm = get_vm_from_activity(act); if (vm != nullptr) { VirtualMachineImpl *vm_impl = vm->get_impl(); vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1; @@ -78,14 +101,14 @@ static void removeActiveTask(kernel::activity::ActivityImplPtr exec) VMModel::VMModel() { all_existing_models.push_back(this); - s4u::Host::on_state_change.connect(hostStateChange); - kernel::activity::ExecImpl::on_creation.connect(addActiveTask); - kernel::activity::ExecImpl::on_completion.connect(removeActiveTask); - kernel::activity::ActivityImpl::on_resumed.connect(addActiveTask); - kernel::activity::ActivityImpl::on_suspended.connect(removeActiveTask); + s4u::Host::on_state_change.connect(host_state_change); + s4u::Exec::on_start.connect(add_active_exec); + s4u::Exec::on_completion.connect(remove_active_exec); + kernel::activity::ActivityImpl::on_resumed.connect(add_active_activity); + kernel::activity::ActivityImpl::on_suspended.connect(remove_active_activity); } -double VMModel::next_occuring_event(double now) +double VMModel::next_occurring_event(double now) { /* TODO: update action's cost with the total cost of processes on the VM. */ @@ -113,7 +136,7 @@ double VMModel::next_occuring_event(double now) /* iterate for all virtual machines */ for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) { - surf::Cpu* cpu = ws_vm->pimpl_cpu; + kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu; double solved_value = ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what @@ -126,7 +149,7 @@ double VMModel::next_occuring_event(double now) } /* 2. Ready. Get the next occurring event */ - return surf_cpu_model_vm->next_occuring_event(now); + return surf_cpu_model_vm->next_occurring_event(now); } /************ @@ -141,20 +164,23 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim allVms_.push_back(piface); /* We create cpu_action corresponding to a VM process on the host operating system. */ - /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ + /* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? + * The value for GUESTOS_NOISE corresponds to the cost of the global action associated to the VM. It corresponds to + * the cost of a VM running no tasks. + */ action_ = host_PM->pimpl_cpu->execution_start(0, core_amount); // It's empty for now, so it should not request resources in the PM update_action_weight(); XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname()); - on_creation(this); + on_creation(*this); } /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */ VirtualMachineImpl::~VirtualMachineImpl() { - on_destruction(this); + on_destruction(*this); /* I was already removed from the allVms set if the VM was destroyed cleanly */ auto iter = find(allVms_.begin(), allVms_.end(), piface_); if (iter != allVms_.end()) @@ -168,10 +194,11 @@ VirtualMachineImpl::~VirtualMachineImpl() void VirtualMachineImpl::suspend(smx_actor_t issuer) { if (get_state() != s4u::VirtualMachine::state::RUNNING) - THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->get_cname()); - if (issuer->host_ == piface_) - THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(), - piface_->get_cname()); + throw VmFailureException(XBT_THROW_POINT, + xbt::string_printf("Cannot suspend VM %s: it is not running.", piface_->get_cname())); + if (issuer->get_host() == piface_) + throw VmFailureException(XBT_THROW_POINT, xbt::string_printf("Actor %s cannot suspend the VM %s in which it runs", + issuer->get_cname(), piface_->get_cname())); XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size()); @@ -179,7 +206,7 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) for (auto& smx_process : process_list_) { XBT_DEBUG("suspend %s", smx_process.get_cname()); - smx_process.suspend(issuer); + smx_process.suspend(); } XBT_DEBUG("suspend all processes on the VM done done"); @@ -190,7 +217,8 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer) void VirtualMachineImpl::resume() { if (get_state() != s4u::VirtualMachine::state::SUSPENDED) - THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname()); + throw VmFailureException(XBT_THROW_POINT, + xbt::string_printf("Cannot resume VM %s: it was not suspended", piface_->get_cname())); XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size()); @@ -227,7 +255,6 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) break; default: /* SURF_VM_STATE_RUNNING or unexpected values */ THROW_IMPOSSIBLE; - break; } XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName); } @@ -236,7 +263,7 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) for (auto& smx_process : process_list_) { XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.get_cname(), - smx_process.host_->get_cname(), issuer->get_cname()); + smx_process.get_host()->get_cname(), issuer->get_cname()); issuer->kill(&smx_process); } @@ -256,14 +283,14 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) std::string pm_name_dst = destination->get_name(); /* update net_elm with that of the destination physical host */ - piface_->pimpl_netpoint = destination->pimpl_netpoint; + piface_->set_netpoint(destination->get_netpoint()); physical_host_ = destination; /* Update vcpu's action for the new pm */ /* create a cpu action bound to the pm model at the destination. */ - surf::CpuAction* new_cpu_action = - static_cast(destination->pimpl_cpu->execution_start(0, this->core_amount_)); + kernel::resource::CpuAction* new_cpu_action = + static_cast(destination->pimpl_cpu->execution_start(0, this->core_amount_)); if (action_->get_remains_no_update() > 0) XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update()); @@ -296,9 +323,9 @@ void VirtualMachineImpl::update_action_weight(){ XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", this, impact, active_tasks_); if (impact > 0) - action_->set_priority(1. / impact); + action_->set_sharing_penalty(1. / impact); else - action_->set_priority(0.); + action_->set_sharing_penalty(0.); action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_)); }