week-end cleanups in ActorImpl

[simgrid.git] / src / plugins / vm / VirtualMachineImpl.cpp

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 3c25ade..727bc34 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -7,6 +7,7 @@
 #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");
@@ -39,9 +40,9 @@ std::deque<s4u::VirtualMachine*> VirtualMachineImpl::allVms_;
  */
 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_)
@@ -52,10 +53,40 @@ static void hostStateChange(s4u::Host& host)
   }
 }
 
+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()
 {
   all_existing_models.push_back(this);
-  s4u::Host::on_state_change.connect(hostStateChange);
+  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)
@@ -98,10 +129,7 @@ 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);
 }
 
@@ -111,7 +139,7 @@ double VMModel::next_occuring_event(double 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);
@@ -120,6 +148,9 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim
   /* 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);
 }
@@ -142,7 +173,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());
 
@@ -209,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);
@@ -258,7 +289,22 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
 
 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_));
 }
 
 }