X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a108fafefaa52133ff6d5dd671ac382ac4089252..471d0736505fc6cfd8f018bdeb8bd3846ee2adad:/include/simgrid/s4u/VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 9205ceecd1..689afdd918 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -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 {
@@ -20,16 +21,18 @@ namespace s4u {
  *
  */
 class XBT_PUBLIC VirtualMachine : public s4u::Host {
-  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+  vm::VirtualMachineImpl* const pimpl_vm_;
   virtual ~VirtualMachine();
 
 public:
-  explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount);
-  explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize);
+  explicit VirtualMachine(const std::string& name, Host* physical_host, int core_amount);
+  explicit VirtualMachine(const std::string& name, Host* physical_host, int core_amount, size_t ramsize);
 
+#ifndef DOXYGEN
   // No copy/move
   VirtualMachine(VirtualMachine const&) = delete;
   VirtualMachine& operator=(VirtualMachine const&) = delete;
+#endif
 
   enum class state {
     CREATED, /**< created, but not yet started */
@@ -38,41 +41,29 @@ public:
     DESTROYED
   };
 
-  simgrid::vm::VirtualMachineImpl* get_impl() { return pimpl_vm_; }
+  vm::VirtualMachineImpl* get_impl() const { return pimpl_vm_; }
   void start();
   void suspend();
   void resume();
   void shutdown();
-  void destroy();
+  void destroy() override;
 
-  simgrid::s4u::Host* get_pm();
-  void set_pm(simgrid::s4u::Host* pm);
-  size_t get_ramsize();
+  Host* get_pm() const;
+  void set_pm(Host* pm);
+  size_t get_ramsize() const;
   void set_ramsize(size_t ramsize);
   void set_bound(double bound);
 
-  VirtualMachine::state getState();
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_start;
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_started;
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_shutdown;
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_suspend;
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_resume;
-
-  // Deprecated methods
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_impl()") simgrid::vm::VirtualMachineImpl* getImpl()
-  {
-    return pimpl_vm_;
-  }
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_pm()") simgrid::s4u::Host* getPm() { return get_pm(); }
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_pm()") void setPm(simgrid::s4u::Host* pm) { set_pm(pm); }
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_ramsize()") size_t getRamsize() { return get_ramsize(); }
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_ramsize()") void setRamsize(size_t ramsize)
-  {
-    set_ramsize(ramsize);
-  }
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_bound()") void setBound(double bound) { set_bound(bound); }
+  VirtualMachine::state get_state();
+  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 simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
 
 #endif