Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
boss not happy, partial revert
[simgrid.git] / src / plugins / vm / VirtualMachineImpl.cpp
index 1a1f03a..b7ccd74 100644 (file)
@@ -1,14 +1,13 @@
-/* Copyright (c) 2013-2017. 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/simix/ActorImpl.hpp"
-#include "src/simix/smx_host_private.hpp"
-
-#include <xbt/asserts.h> // xbt_log_no_loc
+#include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Exec.hpp"
+#include "src/include/surf/surf.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
@@ -16,22 +15,17 @@ simgrid::vm::VMModel* surf_vm_model = nullptr;
 
 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 {
 namespace vm {
-
 /*************
  * Callbacks *
  *************/
-
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmCreation;
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmDestruction;
-simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmStateChange;
+xbt::signal<void(VirtualMachineImpl&)> VirtualMachineImpl::on_creation;
+xbt::signal<void(VirtualMachineImpl const&)> VirtualMachineImpl::on_destruction;
 
 /*********
  * Model *
@@ -45,24 +39,76 @@ 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 const& host)
 {
-  if (host.isOff()) { // 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_)
-      if (vm->getPm() == &host)
+      if (vm->get_pm() == &host)
         trash.push_back(vm);
     for (s4u::VirtualMachine* vm : trash)
-      vm->pimpl_vm_->shutdown(SIMIX_process_self());
+      vm->shutdown();
+  }
+}
+
+static void add_active_exec(s4u::Actor const&, s4u::Exec const& task)
+{
+  s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(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<s4u::VirtualMachine*>(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)
+{
+  auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&act);
+  return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(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();
+  }
+}
+
+static void remove_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();
+  }
+}
+
 VMModel::VMModel()
 {
-  s4u::Host::onStateChange.connect(hostStateChange);
+  all_existing_models.push_back(this);
+  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::nextOccuringEvent(double now)
+double VMModel::next_occurring_event(double now)
 {
   /* TODO: update action's cost with the total cost of processes on the VM. */
 
@@ -90,23 +136,20 @@ double VMModel::nextOccuringEvent(double now)
 
   /* iterate for all virtual machines */
   for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) {
-    surf::Cpu* cpu = ws_vm->pimpl_cpu;
-    xbt_assert(cpu, "cpu-less host");
+    kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
 
-    double solved_value = ws_vm->pimpl_vm_->action_->getVariable()->get_value(); // this is X1 in comment above, what
-                                                                                 // this VM got in the sharing on the PM
-    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->pimpl_vm_->getPm()->getCname());
+    double solved_value =
+        ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
+                                                                 // this VM got in the sharing on the PM
+    XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
 
-    xbt_assert(cpu->model() == surf_cpu_model_vm);
-    surf::lmm_system_t vcpu_system = cpu->model()->getMaxminSystem();
-    vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value);
+    xbt_assert(cpu->get_model() == surf_cpu_model_vm);
+    kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system();
+    vcpu_system->update_constraint_bound(cpu->get_constraint(), virt_overhead * solved_value);
   }
 
-  /* 2. Calculate resource share at the virtual machine layer. */
-  ignoreEmptyVmInPmLMM();
-
-  /* 3. Ready. Get the next occurring event */
-  return surf_cpu_model_vm->nextOccuringEvent(now);
+  /* 2. Ready. Get the next occurring event */
+  return surf_cpu_model_vm->next_occurring_event(now);
 }
 
 /************
@@ -114,103 +157,79 @@ double VMModel::nextOccuringEvent(double now)
  ************/
 
 VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, simgrid::s4u::Host* host_PM,
-                                       int coreAmount)
-    : HostImpl(piface), hostPM_(host_PM), coreAmount_(coreAmount)
+                                       int core_amount, size_t 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);
 
   /* 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 ? */
-  action_ = host_PM->pimpl_cpu->execution_start(0, coreAmount);
+  /* 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);
 
-  /* Initialize the VM parameters */
-  params_.ramsize = 0;
+  // 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->getCname(), hostPM_->getCname());
+  XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname());
+  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()
 {
-  onVmDestruction(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())
     allVms_.erase(iter);
 
-  /* dirty page tracking */
-  unsigned int size          = dp_objs.size();
-  static bool already_warned = false;
-  if (size > 0 && not already_warned) {
-    auto front = dp_objs.begin();
-    XBT_WARN("Dirty page tracking: %u pending task(s) on a destroyed VM (first one is %s).\n"
-             "If you don't understand why your task was not properly removed, please report that bug.\n"
-             "This is a known bug if you turned the host off during the VM execution.\n"
-             "Please remind us of that problem at some point: our code base is not ready to fix this harmless issue in "
-             "2016, sorry.",
-             size, (xbt_log_no_loc ? "(name hidden)" : front->first.c_str()));
-    already_warned = true;
-  }
-
   /* Free the cpu_action of the VM. */
-  XBT_ATTRIB_UNUSED int ret = action_->unref();
-  xbt_assert(ret == 1, "Bug: some resource still remains");
+  XBT_ATTRIB_UNUSED bool ret = action_->unref();
+  xbt_assert(ret, "Bug: some resource still remains");
 }
 
-e_surf_vm_state_t VirtualMachineImpl::getState()
-{
-  return vmState_;
-}
-
-void VirtualMachineImpl::setState(e_surf_vm_state_t state)
-{
-  vmState_ = state;
-}
 void VirtualMachineImpl::suspend(smx_actor_t issuer)
 {
-  if (isMigrating)
-    THROWF(vm_error, 0, "Cannot suspend VM '%s': it is migrating", piface_->getCname());
-  if (getState() != SURF_VM_STATE_RUNNING)
-    THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->getCname());
-  if (issuer->host == piface_)
-    THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->getCname(), piface_->getCname());
+  if (get_state() != s4u::VirtualMachine::state::RUNNING)
+    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_swag_t process_list = piface_->extension<simgrid::simix::Host>()->process_list;
-  XBT_DEBUG("suspend VM(%s), where %d processes exist", piface_->getCname(), xbt_swag_size(process_list));
+  XBT_DEBUG("suspend VM(%s), where %zu actors exist", piface_->get_cname(), get_actor_count());
 
   action_->suspend();
 
-  smx_actor_t smx_process;
-  smx_actor_t smx_process_safe;
-  xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) {
-    XBT_DEBUG("suspend %s", smx_process->name.c_str());
-    smx_process->suspend(issuer);
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("suspend %s", actor.get_cname());
+    actor.suspend();
   }
 
-  XBT_DEBUG("suspend all processes on the VM done done");
+  XBT_DEBUG("suspend all actors on the VM done done");
 
-  vmState_ = SURF_VM_STATE_SUSPENDED;
+  vm_state_ = s4u::VirtualMachine::state::SUSPENDED;
 }
 
 void VirtualMachineImpl::resume()
 {
-  if (getState() != SURF_VM_STATE_SUSPENDED)
-    THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->getCname());
+  if (get_state() != s4u::VirtualMachine::state::SUSPENDED)
+    throw VmFailureException(XBT_THROW_POINT,
+                             xbt::string_printf("Cannot resume VM %s: it was not suspended", piface_->get_cname()));
 
-  xbt_swag_t process_list = piface_->extension<simgrid::simix::Host>()->process_list;
-  XBT_DEBUG("Resume VM %s, containing %d processes.", piface_->getCname(), xbt_swag_size(process_list));
+  XBT_DEBUG("Resume VM %s, containing %zu actors.", piface_->get_cname(), get_actor_count());
 
   action_->resume();
 
-  smx_actor_t smx_process;
-  smx_actor_t smx_process_safe;
-  xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) {
-    XBT_DEBUG("resume %s", smx_process->getCname());
-    smx_process->resume();
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("resume %s", actor.get_cname());
+    actor.resume();
   }
 
-  vmState_ = SURF_VM_STATE_RUNNING;
+  vm_state_ = s4u::VirtualMachine::state::RUNNING;
 }
 
 /** @brief Power off a VM.
@@ -222,104 +241,94 @@ void VirtualMachineImpl::resume()
  */
 void VirtualMachineImpl::shutdown(smx_actor_t issuer)
 {
-  if (getState() != SURF_VM_STATE_RUNNING) {
+  if (get_state() != s4u::VirtualMachine::state::RUNNING) {
     const char* stateName = "(unknown state)";
-    switch (getState()) {
-      case SURF_VM_STATE_CREATED:
+    switch (get_state()) {
+      case s4u::VirtualMachine::state::CREATED:
         stateName = "created, but not yet started";
         break;
-      case SURF_VM_STATE_SUSPENDED:
+      case s4u::VirtualMachine::state::SUSPENDED:
         stateName = "suspended";
         break;
-      case SURF_VM_STATE_DESTROYED:
+      case s4u::VirtualMachine::state::DESTROYED:
         stateName = "destroyed";
         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_->getCname(), stateName);
+    XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
   }
 
-  xbt_swag_t process_list = piface_->extension<simgrid::simix::Host>()->process_list;
-  XBT_DEBUG("shutdown VM %s, that contains %d processes", piface_->getCname(), xbt_swag_size(process_list));
+  XBT_DEBUG("shutdown VM %s, that contains %zu actors", piface_->get_cname(), get_actor_count());
 
-  smx_actor_t smx_process;
-  smx_actor_t smx_process_safe;
-  xbt_swag_foreach_safe(smx_process, smx_process_safe, process_list) {
-    XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process->getCname(),
-              smx_process->host->getCname(), issuer->getCname());
-    SIMIX_process_kill(smx_process, issuer);
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", actor.get_cname(), actor.get_host()->get_cname(),
+              issuer->get_cname());
+    issuer->kill(&actor);
   }
 
-  setState(SURF_VM_STATE_DESTROYED);
+  set_state(s4u::VirtualMachine::state::DESTROYED);
 
   /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
 }
 
-/** @brief returns the physical machine on which the VM is running **/
-s4u::Host* VirtualMachineImpl::getPm()
-{
-  return hostPM_;
-}
-
 /** @brief Change the physical host on which the given VM is running
  *
  * This is an instantaneous migration.
  */
-void VirtualMachineImpl::setPm(s4u::Host* destination)
+void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
 {
-  const char* vm_name     = piface_->getCname();
-  const char* pm_name_src = hostPM_->getCname();
-  const char* pm_name_dst = destination->getCname();
+  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;
+  piface_->set_netpoint(destination->get_netpoint());
 
-  hostPM_ = destination;
+  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<surf::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->coreAmount_));
+  kernel::resource::CpuAction* new_cpu_action =
+      static_cast<kernel::resource::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->core_amount_));
 
-  if (action_->getRemainsNoUpdate() > 0)
-    XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate());
+  if (action_->get_remains_no_update() > 0)
+    XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update());
 
   /* keep the bound value of the cpu action of the VM. */
-  double old_bound = action_->getBound();
+  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);
-    new_cpu_action->setBound(old_bound);
+    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);
   }
 
-  XBT_ATTRIB_UNUSED int ret = action_->unref();
-  xbt_assert(ret == 1, "Bug: some resource still remains");
+  XBT_ATTRIB_UNUSED bool ret = action_->unref();
+  xbt_assert(ret, "Bug: some resource still remains");
 
   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());
 }
 
-sg_size_t VirtualMachineImpl::getRamsize()
+void VirtualMachineImpl::set_bound(double bound)
 {
-  return params_.ramsize;
+  user_bound_ = bound;
+  update_action_weight();
 }
 
-void VirtualMachineImpl::setBound(double bound)
-{
-  action_->setBound(bound);
-}
+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());
 
-void VirtualMachineImpl::getParams(vm_params_t params)
-{
-  *params = params_;
-}
+  XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", this, impact, active_tasks_);
 
-void VirtualMachineImpl::setParams(vm_params_t params)
-{
-  /* may check something here. */
-  params_ = *params;
+  if (impact > 0)
+    action_->set_sharing_penalty(1. / impact);
+  else
+    action_->set_sharing_penalty(0.);
+
+  action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_));
 }
+
 }
 }