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

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index e5b209e456..29174e30a2 100644
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -1,23 +1,25 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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 "src/instr/instr_private.hpp"
+#include "simgrid/vm.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
 #include "src/simix/smx_host_private.hpp"
 #include "src/surf/cpu_cas01.hpp"
-#include <simgrid/vm.h>
-#include <src/plugins/vm/VmLiveMigration.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
 
-simgrid::xbt::signal<void(simgrid::s4u::VirtualMachine*)> simgrid::s4u::VirtualMachine::onVmShutdown;
 
 namespace simgrid {
 namespace s4u {
+simgrid::xbt::signal<void(VirtualMachine&)> VirtualMachine::on_start;
+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;
 
 VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount)
     : VirtualMachine(name, pm, coreAmount, 1024)
@@ -40,20 +42,13 @@ VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount,
 
   /* Make a process container */
   extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
-
-  if (TRACE_vm_is_enabled()) {
-    container_t host_container = instr::Container::byName(pm->getName());
-    new instr::Container(name, "MSG_VM", host_container);
-    instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("start", "0 0 1");   // start is blue
-    instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("suspend", "1 0 0"); // suspend is red
-  }
 }
 
 VirtualMachine::~VirtualMachine()
 {
   onDestruction(*this);
 
-  XBT_DEBUG("destroy %s", getCname());
+  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...
@@ -65,15 +60,11 @@ VirtualMachine::~VirtualMachine()
 
   /* Don't free these things twice: they are the ones of my physical host */
   pimpl_netpoint = nullptr;
-
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(getName())->removeFromParent();
 }
 
 void VirtualMachine::start()
 {
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("start");
+  on_start(*this);
 
   simgrid::simix::kernelImmediate([this]() {
     simgrid::vm::VmHostExt::ensureVmExtInstalled();
@@ -95,40 +86,36 @@ void VirtualMachine::start()
 
       if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) {
         XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
-                 this->getCname(), pm->getCname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
-        THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->getCname(),
-               this->getCname());
+                 this->get_cname(), pm->get_cname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
+        THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->get_cname(),
+               this->get_cname());
       }
     }
 
     this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
   });
 
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
+  on_started(*this);
 }
 
 void VirtualMachine::suspend()
 {
+  on_suspend(*this);
   smx_actor_t issuer = SIMIX_process_self();
   simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); });
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("suspend");
-  XBT_DEBUG("vm_suspend done");
 }
 
 void VirtualMachine::resume()
 {
   pimpl_vm_->resume();
-  if (TRACE_vm_is_enabled())
-    simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
+  on_resume(*this);
 }
 
 void VirtualMachine::shutdown()
 {
   smx_actor_t issuer = SIMIX_process_self();
   simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->shutdown(issuer); });
-  onVmShutdown(this);
+  on_shutdown(*this);
 }
 
 void VirtualMachine::destroy()
@@ -200,7 +187,6 @@ void VirtualMachine::setBound(double bound)
 
 /* **************************** Public C interface *************************** */
 
-SG_BEGIN_DECL()
 /** @brief Create a new VM object with the default parameters
  * A VM is treated as a host. The name of the VM must be unique among all hosts.
  */
@@ -221,7 +207,7 @@ sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount)
 
 const char* sg_vm_get_name(sg_vm_t vm)
 {
-  return vm->getCname();
+  return vm->get_cname();
 }
 
 /** @brief Get the physical host of a given VM. */
@@ -306,5 +292,3 @@ void sg_vm_destroy(sg_vm_t vm)
 {
   vm->destroy();
 }
-
-SG_END_DECL()