Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
add Host::send_to and sg_send_to
[simgrid.git] / include / simgrid / s4u / VirtualMachine.hpp
index b2bd8aa..5ea7916 100644 (file)
@@ -6,6 +6,7 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
+#include <simgrid/forward.h>
 #include <simgrid/s4u/Host.hpp>
 
 namespace simgrid {
@@ -38,7 +39,7 @@ public:
     DESTROYED
   };
 
-  vm::VirtualMachineImpl* get_impl() { return pimpl_vm_; }
+  vm::VirtualMachineImpl* get_impl() const { return pimpl_vm_; }
   void start();
   void suspend();
   void resume();
@@ -52,40 +53,13 @@ public:
   void set_bound(double bound);
 
   VirtualMachine::state get_state();
-  static xbt::signal<void(VirtualMachine&)> on_start;
-  static xbt::signal<void(VirtualMachine&)> on_started;
-  static xbt::signal<void(VirtualMachine&)> on_shutdown;
-  static xbt::signal<void(VirtualMachine&)> on_suspend;
-  static xbt::signal<void(VirtualMachine&)> on_resume;
-  static xbt::signal<void(VirtualMachine&)> on_migration_start;
-  static xbt::signal<void(VirtualMachine&)> on_migration_end;
-
-#ifndef DOXYGEN
-  // Deprecated methods
-  /** @deprecated See VirtualMachine::get_state() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_state()") VirtualMachine::state getState()
-  {
-    return get_state();
-  }
-  /** @deprecated See VirtualMachine::get_impl() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_impl()") vm::VirtualMachineImpl* getImpl()
-  {
-    return pimpl_vm_;
-  }
-  /** @deprecated See VirtualMachine::get_pm() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_pm()") Host* getPm() { return get_pm(); }
-  /** @deprecated See VirtualMachine::set_pm() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_pm()") void setPm(Host* pm) { set_pm(pm); }
-  /** @deprecated See VirtualMachine::get_ramsize() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_ramsize()") size_t getRamsize() { return get_ramsize(); }
-  /** @deprecated See VirtualMachine::set_ramsize() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_ramsize()") void setRamsize(size_t ramsize)
-  {
-    set_ramsize(ramsize);
-  }
-  /** @deprecated See VirtualMachine::set_bound() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_bound()") void setBound(double bound) { set_bound(bound); }
-#endif
+  static xbt::signal<void(VirtualMachine const&)> on_start;
+  static xbt::signal<void(VirtualMachine const&)> on_started;
+  static xbt::signal<void(VirtualMachine const&)> on_shutdown;
+  static xbt::signal<void(VirtualMachine const&)> on_suspend;
+  static xbt::signal<void(VirtualMachine const&)> on_resume;
+  static xbt::signal<void(VirtualMachine const&)> on_migration_start;
+  static xbt::signal<void(VirtualMachine const&)> on_migration_end;
 };
 } // namespace s4u
 } // namespace simgrid