-/* 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/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");
void surf_vm_model_init_HL13()
{
- if (surf_cpu_model_vm) {
+ if (surf_cpu_model_vm != nullptr)
surf_vm_model = new simgrid::vm::VMModel();
- all_existing_models->push_back(surf_vm_model);
- }
}
namespace simgrid {
*/
const double virt_overhead = 1; // 0.95
-static void hostStateChange(s4u::Host& host)
+static void host_state_change(s4u::Host& host)
{
- if (host.is_off()) { // just turned off.
+ if (not host.is_on()) { // just turned off.
std::vector<s4u::VirtualMachine*> trash;
/* Find all VMs living on that host */
for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_)
}
}
+static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImplPtr task)
+{
+ kernel::activity::ExecImpl* exec = dynamic_cast<kernel::activity::ExecImpl*>(task.get());
+ return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->host_) : nullptr;
+}
+
+static void add_active_task(kernel::activity::ActivityImplPtr 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;
+ vm_impl->update_action_weight();
+ }
+}
+
+static void remove_active_task(kernel::activity::ActivityImplPtr 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;
+ vm_impl->update_action_weight();
+ }
+}
+
VMModel::VMModel()
{
- s4u::Host::on_state_change.connect(hostStateChange);
+ all_existing_models.push_back(this);
+ 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)
vcpu_system->update_constraint_bound(cpu->get_constraint(), virt_overhead * solved_value);
}
- /* 2. Calculate resource share at the virtual machine layer. */
- ignore_empty_vm_in_pm_LMM();
-
- /* 3. Ready. Get the next occurring event */
+ /* 2. Ready. Get the next occurring event */
return surf_cpu_model_vm->next_occuring_event(now);
}
VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM,
int core_amount, size_t ramsize)
- : HostImpl(piface), physical_host_(host_PM), core_amount_(core_amount), ramsize_(ramsize)
+ : HostImpl(piface), physical_host_(host_PM), core_amount_(core_amount), user_bound_(std::numeric_limits<double>::max()), ramsize_(ramsize)
{
/* Register this VM to the list of all VMs */
allVms_.push_back(piface);
/* TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
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);
}
{
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());
- auto& process_list = piface_->pimpl_->process_list;
- XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size());
action_->suspend();
- for (auto& smx_process : process_list) {
+ for (auto& smx_process : process_list_) {
XBT_DEBUG("suspend %s", smx_process.get_cname());
smx_process.suspend(issuer);
}
if (get_state() != s4u::VirtualMachine::state::SUSPENDED)
THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname());
- auto& process_list = piface_->pimpl_->process_list;
- XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size());
action_->resume();
- for (auto& smx_process : process_list) {
+ for (auto& smx_process : process_list_) {
XBT_DEBUG("resume %s", smx_process.get_cname());
smx_process.resume();
}
XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
}
- auto& process_list = piface_->pimpl_->process_list;
- XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list_.size());
- for (auto& smx_process : process_list) {
+ 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);
*/
void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
{
- const char* vm_name = piface_->get_cname();
- const char* pm_name_src = physical_host_->get_cname();
- const char* pm_name_dst = destination->get_cname();
+ std::string vm_name = piface_->get_name();
+ std::string pm_name_src = physical_host_->get_name();
+ std::string pm_name_dst = destination->get_name();
/* update net_elm with that of the destination physical host */
piface_->pimpl_netpoint = destination->pimpl_netpoint;
/* keep the bound value of the cpu action of the VM. */
double old_bound = action_->get_bound();
if (old_bound > 0) {
- XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst);
+ XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name.c_str(), old_bound, pm_name_dst.c_str());
new_cpu_action->set_bound(old_bound);
}
action_ = new_cpu_action;
- XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst);
+ XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name.c_str(), pm_name_src.c_str(), pm_name_dst.c_str());
}
void VirtualMachineImpl::set_bound(double bound)
{
- action_->set_bound(bound);
+ user_bound_ = bound;
+ update_action_weight();
+}
+
+void VirtualMachineImpl::update_action_weight(){
+ /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */
+ int impact = std::min(active_tasks_, get_core_amount());
+
+ 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);
+ else
+ action_->set_priority(0.);
+
+ action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_));
}
}
