X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46f56109cc64b4b1618f7bbdc2762d0c8b9f5100..07ac1ad16dcfcb2921f2c3c5bf30338eae8fffe8:/include/simgrid/s4u/VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index d2410febf3..76e83805ae 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-2021. 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,7 +6,9 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
+#include <simgrid/forward.h>
 #include <simgrid/s4u/Host.hpp>
+#include <xbt/utility.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -20,74 +22,53 @@ namespace s4u {
  *
  */
 class XBT_PUBLIC VirtualMachine : public s4u::Host {
-  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
-  virtual ~VirtualMachine();
+  vm::VirtualMachineImpl* const pimpl_vm_;
+  ~VirtualMachine() override;
 
 public:
-  explicit VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount);
-  explicit VirtualMachine(std::string 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 {
+  // enum class State { ... }
+  XBT_DECLARE_ENUM_CLASS(State,
     CREATED, /**< created, but not yet started */
     RUNNING,
     SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */
     DESTROYED
-  };
+  );
+#ifndef DOXYGEN
+  using state XBT_ATTRIB_DEPRECATED_v332("Please use VirtualMachine::State") = State;
+#endif
 
-  simgrid::vm::VirtualMachineImpl* get_impl() { return pimpl_vm_; }
+  vm::VirtualMachineImpl* get_vm_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();
-  void set_ramsize(size_t ramsize);
-  void set_bound(double bound);
+  Host* get_pm() const;
+  VirtualMachine* set_pm(Host* pm);
+  size_t get_ramsize() const;
+  VirtualMachine* set_ramsize(size_t ramsize);
+  VirtualMachine* set_bound(double bound);
 
-  VirtualMachine::state get_state();
-  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;
-  static simgrid::xbt::signal<void(VirtualMachine&)> on_migration_start;
-  static simgrid::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()") simgrid::vm::VirtualMachineImpl* getImpl()
-  {
-    return pimpl_vm_;
-  }
-  /** @deprecated See VirtualMachine::get_pm() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::get_pm()") simgrid::s4u::Host* getPm() { return get_pm(); }
-  /** @deprecated See VirtualMachine::set_pm() */
-  XBT_ATTRIB_DEPRECATED_v323("Please use VirtualMachine::set_pm()") void setPm(simgrid::s4u::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
+  State get_state() const;
+  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