X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6957f33a8f941b49d923e43675d50fe2671a554..1637938a79546eb0b858a3e8ae3b28bd4af96ea4:/src/plugins/vm/s4u_VirtualMachine.cpp

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index a3c9efdf07..45a9899da6 100644
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -1,10 +1,11 @@
-/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-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 "simgrid/s4u/Actor.hpp"
 #include "simgrid/vm.h"
+#include "src/include/surf/surf.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
 #include "src/simix/smx_host_private.hpp"
@@ -20,16 +21,21 @@ simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_started;
 simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_shutdown;
 simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_suspend;
 simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_resume;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_migration_start;
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_migration_end;
 
-VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount)
-    : VirtualMachine(name, physical_host, core_amount, 1024)
+VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount)
+    : VirtualMachine(std::move(name), physical_host, core_amount, 1024)
 {
 }
 
-VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize)
-    : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize))
+VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount, size_t ramsize)
+    : Host(std::move(name)), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize))
 {
-  XBT_DEBUG("Create VM %s", name);
+  // xbt_assert(s4u::Host::by_name(name) == nullptr,
+  //           "Cannot create a VM named %s: this name is already used by a host or a VM", get_cname());
+
+  XBT_DEBUG("Create VM %s", get_cname());
 
   /* Currently, a VM uses the network resource of its physical host */
   pimpl_netpoint = physical_host->pimpl_netpoint;
@@ -37,14 +43,11 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int c
   // Create a VCPU for this VM
   std::vector<double> speeds;
   for (int i = 0; i < physical_host->get_pstate_count(); i++)
-    speeds.push_back(physical_host->getPstateSpeed(i));
+    speeds.push_back(physical_host->get_pstate_speed(i));
 
-  surf_cpu_model_vm->create_cpu(this, &speeds, physical_host->get_core_count());
+  surf_cpu_model_vm->create_cpu(this, &speeds, core_amount);
   if (physical_host->get_pstate() != 0)
     set_pstate(physical_host->get_pstate());
-
-  /* Make a process container */
-  extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
 }
 
 VirtualMachine::~VirtualMachine()
@@ -53,14 +56,6 @@ VirtualMachine::~VirtualMachine()
 
   XBT_DEBUG("destroy %s", get_cname());
 
-  /* FIXME: this is really strange that everything fails if the next line is removed.
-   * This is as if we shared these data with the PM, which definitely should not be the case...
-   *
-   * We need to test that suspending a VM does not suspends the processes running on its PM, for example.
-   * Or we need to simplify this code enough to make it actually readable (but this sounds harder than testing)
-   */
-  extension_set<simgrid::simix::Host>(nullptr);
-
   /* Don't free these things twice: they are the ones of my physical host */
   pimpl_netpoint = nullptr;
 }
@@ -95,7 +90,7 @@ void VirtualMachine::start()
       }
     }
 
-    this->pimpl_vm_->set_state(SURF_VM_STATE_RUNNING);
+    this->pimpl_vm_->set_state(VirtualMachine::state::RUNNING);
   });
 
   on_started(*this);
@@ -140,7 +135,7 @@ void VirtualMachine::set_pm(simgrid::s4u::Host* pm)
   simgrid::simix::simcall([this, pm]() { pimpl_vm_->set_physical_host(pm); });
 }
 
-e_surf_vm_state_t VirtualMachine::getState()
+VirtualMachine::state VirtualMachine::get_state()
 {
   return simgrid::simix::simcall([this]() { return pimpl_vm_->get_state(); });
 }
@@ -202,9 +197,6 @@ sg_vm_t sg_vm_create_core(sg_host_t pm, const char* name)
  */
 sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount)
 {
-  xbt_assert(sg_host_by_name(name) == nullptr,
-             "Cannot create a VM named %s: this name is already used by an host or a VM", name);
-
   return new simgrid::s4u::VirtualMachine(name, pm, coreAmount);
 }
 
@@ -237,19 +229,19 @@ void sg_vm_set_bound(sg_vm_t vm, double bound)
 /** @brief Returns whether the given VM has just created, not running. */
 int sg_vm_is_created(sg_vm_t vm)
 {
-  return vm->getState() == SURF_VM_STATE_CREATED;
+  return vm->get_state() == simgrid::s4u::VirtualMachine::state::CREATED;
 }
 
 /** @brief Returns whether the given VM is currently running */
 int sg_vm_is_running(sg_vm_t vm)
 {
-  return vm->getState() == SURF_VM_STATE_RUNNING;
+  return vm->get_state() == simgrid::s4u::VirtualMachine::state::RUNNING;
 }
 
 /** @brief Returns whether the given VM is currently suspended, not running. */
 int sg_vm_is_suspended(sg_vm_t vm)
 {
-  return vm->getState() == SURF_VM_STATE_SUSPENDED;
+  return vm->get_state() == simgrid::s4u::VirtualMachine::state::SUSPENDED;
 }
 
 /** @brief Start a vm (i.e., boot the guest operating system)