X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ab418a9da27a01b9155759bdf1669696fe764bb..eadbe829389f23151f79257824f3164d7801bbc7:/src/plugins/vm/VirtualMachineImpl.cpp diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 3ba781b1e6..912c575dc7 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -1,12 +1,10 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ /* 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 "src/plugins/vm/VirtualMachineImpl.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 @@ -25,9 +23,9 @@ namespace vm { /************* * Callbacks * *************/ -simgrid::xbt::signal VirtualMachineImpl::on_creation; -simgrid::xbt::signal VirtualMachineImpl::on_destruction; -simgrid::xbt::signal VirtualMachineImpl::on_state_change; +simgrid::xbt::signal VirtualMachineImpl::on_creation; +simgrid::xbt::signal VirtualMachineImpl::on_destruction; + /********* * Model * *********/ @@ -40,9 +38,9 @@ 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 (host.is_off()) { // just turned off. + if (not host.is_on()) { // just turned off. std::vector trash; /* Find all VMs living on that host */ for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_) @@ -53,9 +51,15 @@ static void hostStateChange(s4u::Host& host) } } -static void addActiveTask(kernel::activity::ExecImplPtr exec) +static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImpl const& task) { - s4u::VirtualMachine *vm = dynamic_cast(exec->host_); + auto* exec = dynamic_cast(&task); + return exec != nullptr ? dynamic_cast(exec->host_) : nullptr; +} + +static void add_active_task(kernel::activity::ActivityImpl const& task) +{ + s4u::VirtualMachine* vm = get_vm_from_task(task); if (vm != nullptr) { VirtualMachineImpl *vm_impl = vm->get_impl(); vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1; @@ -63,9 +67,9 @@ static void addActiveTask(kernel::activity::ExecImplPtr exec) } } -static void removeActiveTask(kernel::activity::ExecImplPtr exec) +static void remove_active_task(kernel::activity::ActivityImpl const& task) { - s4u::VirtualMachine *vm = dynamic_cast(exec->host_); + s4u::VirtualMachine* vm = get_vm_from_task(task); if (vm != nullptr) { VirtualMachineImpl *vm_impl = vm->get_impl(); vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1; @@ -76,11 +80,11 @@ static void removeActiveTask(kernel::activity::ExecImplPtr 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::ExecImpl::on_resumed.connect(addActiveTask); - kernel::activity::ExecImpl::on_suspended.connect(removeActiveTask); + s4u::Host::on_state_change.connect(host_state_change); + kernel::activity::ExecImpl::on_creation.connect(add_active_task); + kernel::activity::ExecImpl::on_completion.connect(remove_active_task); + kernel::activity::ActivityImpl::on_resumed.connect(add_active_task); + kernel::activity::ActivityImpl::on_suspended.connect(remove_active_task); } double VMModel::next_occuring_event(double now) @@ -139,20 +143,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()) @@ -167,7 +174,7 @@ 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_) + if (issuer->get_host() == piface_) THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(), piface_->get_cname()); @@ -225,7 +232,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); } @@ -234,8 +240,8 @@ 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()); - SIMIX_process_kill(&smx_process, issuer); + smx_process.get_host()->get_cname(), issuer->get_cname()); + issuer->kill(&smx_process); } set_state(s4u::VirtualMachine::state::DESTROYED);