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

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index b65d29198b..d75e48029f 100644
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -4,6 +4,9 @@
 /* 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 <deque>
+#include <boost/intrusive/list.hpp>
+
 #include <xbt/base.h>
 
 #include "src/surf/HostImpl.hpp"
@@ -31,17 +34,17 @@ class XBT_PRIVATE VirtualMachine;
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmCreation;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmDestruction;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmStateChange;
 
 /************
  * Resource *
@@ -75,7 +78,6 @@ public:
   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 *action_;
@@ -88,11 +90,10 @@ public:
 
   e_surf_vm_state_t getState();
   void setState(e_surf_vm_state_t state);
+  static std::deque<VirtualMachine*> allVms_;
+
 protected:
   e_surf_vm_state_t p_vm_state = SURF_VM_STATE_CREATED;
-
-public:
-  boost::intrusive::list_member_hook<> vm_hook;
 };
 
 /*********
@@ -113,13 +114,8 @@ public:
    * @param name The name of the new VM
    * @param host_PM The real machine hosting the VM
    */
-  virtual VirtualMachine *createVM(const char *name, sg_host_t host_PM)=0;
+  virtual s4u::Host *createVM(const char *name, sg_host_t host_PM)=0;
   void adjustWeightOfDummyCpuActions() {};
-
-  typedef boost::intrusive::member_hook<
-    VirtualMachine, boost::intrusive::list_member_hook<>, &VirtualMachine::vm_hook> VmOptions;
-  typedef boost::intrusive::list<VirtualMachine, VmOptions, boost::intrusive::constant_time_size<false> > vm_list_t;
-  static vm_list_t ws_vms;
 };
 
 }