X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/640e6f6494f5e1151f6436aea0e0c515da2c144b..7d6c459a38d4385a4e269fcd16c426290e5061d7:/include/simgrid/s4u/VirtualMachine.hpp diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index b2bd8aa175..5ea79167d2 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -6,6 +6,7 @@ #ifndef SIMGRID_S4U_VM_HPP #define SIMGRID_S4U_VM_HPP +#include #include 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 on_start; - static xbt::signal on_started; - static xbt::signal on_shutdown; - static xbt::signal on_suspend; - static xbt::signal on_resume; - static xbt::signal on_migration_start; - static xbt::signal 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 on_start; + static xbt::signal on_started; + static xbt::signal on_shutdown; + static xbt::signal on_suspend; + static xbt::signal on_resume; + static xbt::signal on_migration_start; + static xbt::signal on_migration_end; }; } // namespace s4u } // namespace simgrid