X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e112990de34a1d23cc56293558545ad16d1f7dfa..579222ddee9e350c59189d9ee93d089292a64c15:/include/simgrid/s4u/VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index de4ebd8027..63f0aaf390 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -6,8 +6,7 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/forward.hpp"
+#include <simgrid/s4u/Host.hpp>
 
 enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
@@ -17,9 +16,6 @@ enum e_surf_vm_state_t {
 };
 
 namespace simgrid {
-namespace vm {
-class VirtualMachineImpl;
-};
 namespace s4u {
 
 /** @ingroup s4u_api
@@ -30,8 +26,9 @@ namespace s4u {
  * The total computing power that the contained actors can get is constrained to the virtual machine size.
  *
  */
-XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
-{
+class XBT_PUBLIC VirtualMachine : public s4u::Host {
+  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+  virtual ~VirtualMachine();
 
 public:
   explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount);
@@ -41,15 +38,12 @@ public:
   VirtualMachine(VirtualMachine const&) = delete;
   VirtualMachine& operator=(VirtualMachine const&) = delete;
 
-private:
-  virtual ~VirtualMachine();
-public:
+  simgrid::vm::VirtualMachineImpl* getImpl() { return pimpl_vm_; }
   void start();
   void suspend();
   void resume();
   void shutdown();
-
-  bool isMigrating();
+  void destroy();
 
   simgrid::s4u::Host* getPm();
   void setPm(simgrid::s4u::Host * pm);
@@ -58,11 +52,13 @@ public:
   void setBound(double bound);
 
   e_surf_vm_state_t getState();
-
-  /* FIXME: protect me */
-  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_start;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_started;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_shutdown;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_suspend;
+  static simgrid::xbt::signal<void(VirtualMachine&)> on_resume;
 };
 }
 } // namespace simgrid::s4u
 
-#endif /* SIMGRID_S4U_HOST_HPP */
+#endif