Reorganize VM code

[simgrid.git] / include / simgrid / s4u / VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 689afdd..d1c7a84 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2020. 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. */
@@ -8,10 +8,21 @@
 
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Host.hpp>
+#include <xbt/utility.hpp>
 
 namespace simgrid {
 namespace s4u {
 
+/** @brief Host extension for the VMs */
+class VmHostExt {
+public:
+  static xbt::Extension<s4u::Host, VmHostExt> EXTENSION_ID;
+
+  sg_size_t ramsize = 0;    /* available ramsize (0= not taken into account) */
+  bool overcommit   = true; /* Whether the host allows overcommiting more VM than the avail ramsize allows */
+  static void ensureVmExtInstalled();
+};
+
 /** @ingroup s4u_api
  *
  * @tableofcontents
@@ -21,8 +32,7 @@ namespace s4u {
  *
  */
 class XBT_PUBLIC VirtualMachine : public s4u::Host {
-  vm::VirtualMachineImpl* const pimpl_vm_;
-  virtual ~VirtualMachine();
+  kernel::resource::VirtualMachineImpl* const pimpl_vm_;
 
 public:
   explicit VirtualMachine(const std::string& name, Host* physical_host, int core_amount);
@@ -34,14 +44,18 @@ public:
   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
 
-  vm::VirtualMachineImpl* get_impl() const { return pimpl_vm_; }
+  kernel::resource::VirtualMachineImpl* get_vm_impl() const { return pimpl_vm_; }
   void start();
   void suspend();
   void resume();
@@ -49,12 +63,13 @@ public:
   void destroy() override;
 
   Host* get_pm() const;
-  void set_pm(Host* pm);
+  VirtualMachine* set_pm(Host* pm);
   size_t get_ramsize() const;
-  void set_ramsize(size_t ramsize);
-  void set_bound(double bound);
+  VirtualMachine* set_ramsize(size_t ramsize);
+  VirtualMachine* set_bound(double bound);
 
-  VirtualMachine::state get_state();
+  State get_state() const;
+  static xbt::signal<void(VirtualMachine&)> on_creation;
   static xbt::signal<void(VirtualMachine const&)> on_start;
   static xbt::signal<void(VirtualMachine const&)> on_started;
   static xbt::signal<void(VirtualMachine const&)> on_shutdown;
@@ -62,6 +77,7 @@ public:
   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;
+  static xbt::signal<void(VirtualMachine const&)> on_destruction;
 };
 } // namespace s4u
 } // namespace simgrid