X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98a167fa2243c248259017276314ff93c8e841fe..ce3bec73b984f5d517033220533448d4bbb6d809:/src/surf/virtual_machine.hpp

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index 7860de60b3..21c48969d0 100644
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -14,6 +14,9 @@
 #define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
                           // It corresponds to the cost of a VM running no tasks.
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
@@ -28,17 +31,17 @@ class XBT_PRIVATE VirtualMachine;
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE surf_callback(void, VirtualMachine*) VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
 
 /************
  * Resource *
@@ -56,17 +59,14 @@ public:
    * @param model VMModel associated to this VM
    * @param name The name of the VM
    * @param props Dictionary of properties associated to this VM
-   * @param netElm The RoutingEdge associated to this VM
-   * @param cpu The Cpu associated to this VM
+   * @param host The host
    */
-  VirtualMachine(Model *model, const char *name, xbt_dict_t props,
-		        RoutingEdge *netElm, Cpu *cpu);
+  VirtualMachine(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
+            simgrid::s4u::Host *host);
 
   /** @brief Destructor */
   ~VirtualMachine();
 
-  void setState(e_surf_resource_state_t state);
-
   /** @brief Suspend the VM */
   virtual void suspend()=0;
 
@@ -80,18 +80,28 @@ public:
   virtual void restore()=0;
 
   /** @brief Migrate the VM to the destination host */
-  virtual void migrate(surf_resource_t dest_PM)=0;
+  virtual void migrate(sg_host_t dest_PM)=0;
 
   /** @brief Get the physical machine hosting the VM */
-  virtual surf_resource_t getPm()=0;
+  sg_host_t getPm();
 
   virtual void setBound(double bound)=0;
   virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
 
   /* The vm object of the lower layer */
   CpuAction *p_action;
-  Host *p_subWs;
-  e_surf_vm_state_t p_currentState;
+  simgrid::s4u::Host *p_hostPM;
+
+  void turnOn() override;
+  void turnOff() override;
+
+public:
+  e_surf_vm_state_t getState();
+  void setState(e_surf_vm_state_t state);
+protected:
+  e_surf_vm_state_t p_vm_state = SURF_VM_STATE_CREATED;
+
+
 public:
   boost::intrusive::list_member_hook<> vm_hook;
 };
@@ -108,8 +118,6 @@ public:
   VMModel() :HostModel(){}
   ~VMModel(){};
 
-  Host *createHost(const char *name){DIE_IMPOSSIBLE;}
-
   /**
    * @brief Create a new VM
    *
@@ -117,7 +125,7 @@ public:
    * @param host_PM The real machine hosting the VM
    *
    */
-  virtual VirtualMachine *createVM(const char *name, surf_resource_t host_PM)=0;
+  virtual VirtualMachine *createVM(const char *name, sg_host_t host_PM)=0;
   void adjustWeightOfDummyCpuActions() {};
 
   typedef boost::intrusive::member_hook<
@@ -126,8 +134,7 @@ public:
   static vm_list_t ws_vms;
 };
 
-/**********
- * Action *
- **********/
+}
+}
 
 #endif /* VM_INTERFACE_HPP_ */