X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/712c213599a4a608ff1f84b2a58f88f8f35e2b43..579222ddee9e350c59189d9ee93d089292a64c15:/include/simgrid/s4u/VirtualMachine.hpp

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 6dfb9998d7..63f0aaf390 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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,55 +6,59 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
-#include "simgrid/datatypes.h"
-#include "simgrid/s4u/forward.hpp"
-#include "simgrid/s4u/host.hpp"
+#include <simgrid/s4u/Host.hpp>
 
-typedef enum {
+enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
   SURF_VM_STATE_RUNNING,
   SURF_VM_STATE_SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */
-} e_surf_vm_state_t;
+  SURF_VM_STATE_DESTROYED
+};
 
 namespace simgrid {
-namespace vm {
-class VirtualMachineImpl;
-};
 namespace s4u {
 
 /** @ingroup s4u_api
  *
  * @tableofcontents
  *
- * A VM is a virtual machine that contains actors. The total computing power that the contained
- * processes can get is constrained to the virtual machine size.
+ * A VM represents a virtual machine (or a container) that hosts actors.
+ * The total computing power that the contained actors can get is constrained to the virtual machine size.
  *
  */
-XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
-{
+class XBT_PUBLIC VirtualMachine : public s4u::Host {
+  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+  virtual ~VirtualMachine();
 
 public:
-  explicit VirtualMachine(const char* name, s4u::Host* hostPm);
+  explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount);
+  explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount, size_t ramsize);
 
   // No copy/move
   VirtualMachine(VirtualMachine const&) = delete;
   VirtualMachine& operator=(VirtualMachine const&) = delete;
 
-private:
-  virtual ~VirtualMachine();
-
-public:
-  bool isMigrating();
+  simgrid::vm::VirtualMachineImpl* getImpl() { return pimpl_vm_; }
+  void start();
+  void suspend();
+  void resume();
+  void shutdown();
+  void destroy();
 
-  void parameters(vm_params_t params);
-  void setParameters(vm_params_t params);
-  double getRamsize();
-  simgrid::s4u::Host* pm();
+  simgrid::s4u::Host* getPm();
+  void setPm(simgrid::s4u::Host * pm);
+  size_t getRamsize();
+  void setRamsize(size_t ramsize);
+  void setBound(double bound);
 
-  /* FIXME: protect me */
-  simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+  e_surf_vm_state_t 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;
 };
 }
 } // namespace simgrid::s4u
 
-#endif /* SIMGRID_S4U_HOST_HPP */
+#endif