Fix bug #17132 (surf.c:366: The Impossible Did Happen (yet again)).

[simgrid.git] / src / surf / vm_workstation_interface.hpp

diff --git a/src/surf/vm_workstation_interface.hpp b/src/surf/vm_workstation_interface.hpp
index ec334ac..66a3e9d 100644 (file)
--- a/src/surf/vm_workstation_interface.hpp
+++ b/src/surf/vm_workstation_interface.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -27,6 +27,28 @@ typedef WorkstationVM *WorkstationVMPtr;
 class WorkstationVMLmm;
 typedef WorkstationVMLmm *WorkstationVMLmmPtr;
 
+/*************
+ * Callbacks *
+ *************/
+
+/** @ingroup SURF_callbacks
+ * @brief Callbacks handler which emit the callbacks after WorkstationVM creation *
+ * @details Callback functions have the following signature: `void(WorkstationVMPtr)`
+ */
+extern surf_callback(void, WorkstationVMPtr) workstationVMCreatedCallbacks;
+
+/** @ingroup SURF_callbacks
+ * @brief Callbacks handler which emit the callbacks after WorkstationVM destruction *
+ * @details Callback functions have the following signature: `void(WorkstationVMPtr)`
+ */
+extern surf_callback(void, WorkstationVMPtr) workstationVMDestructedCallbacks;
+
+/** @ingroup SURF_callbacks
+ * @brief Callbacks handler which emit the callbacks after WorkstationVM State changed *
+ * @details Callback functions have the following signature: `void(WorkstationVMActionPtr)`
+ */
+extern surf_callback(void, WorkstationVMPtr) workstationVMStateChangedCallbacks;
+
 /*********
  * Model *
  *********/
@@ -55,8 +77,12 @@ public:
    */
   virtual void createResource(const char *name, void *ind_phys_workstation)=0;
 
-
   void adjustWeightOfDummyCpuActions() {};
+
+  typedef boost::intrusive::list<WorkstationVM,
+                                 boost::intrusive::constant_time_size<false> >
+          vm_list_t;
+  static vm_list_t ws_vms;
 };
 
 /************
@@ -67,7 +93,8 @@ public:
  * @brief SURF workstation VM interface class
  * @details A workstation VM represent an virtual machine
  */
-class WorkstationVM : public Workstation {
+class WorkstationVM : public Workstation,
+                      public boost::intrusive::list_base_hook<> {
 public:
   /**
    * @brief WorkstationVM consrtructor
@@ -79,14 +106,15 @@ public:
    * @param cpu The Cpu associated to this Workstation
    */
   WorkstationVM(ModelPtr model, const char *name, xbt_dict_t props,
-                       RoutingEdgePtr netElm, CpuPtr cpu)
-  : Workstation(model, name, props, NULL, netElm, cpu) {}
+                       RoutingEdgePtr netElm, CpuPtr cpu);
 
   /**
-   * @brief WdorkstationVM estructor
+   * @brief WdorkstationVM destructor
    */
   ~WorkstationVM();
 
+  void setState(e_surf_resource_state_t state);
+
   /**
    * @brief Suspend the VM
    */