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

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index de3ecc0fdf..d455e5628f 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-2017. 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,19 +6,16 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
-#include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/host.hpp>
-#include <xbt/base.h>
+#include "simgrid/datatypes.h"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/forward.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. */
-
-  SURF_VM_STATE_SAVING, /**< Save/restore involves disk I/O, so there should be transition states. */
-  SURF_VM_STATE_SAVED,
-  SURF_VM_STATE_RESTORING,
-} e_surf_vm_state_t;
+  SURF_VM_STATE_DESTROYED
+};
 
 namespace simgrid {
 namespace vm {
@@ -30,15 +27,16 @@ namespace s4u {
  *
  * @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
 {
 
 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;
@@ -46,13 +44,20 @@ public:
 
 private:
   virtual ~VirtualMachine();
-
 public:
+  void start();
+  void suspend();
+  void resume();
+
   bool isMigrating();
 
-  void parameters(vm_params_t params);
+  void getParameters(vm_params_t params);
   void setParameters(vm_params_t params);
-  double getRamsize();
+  simgrid::s4u::Host* getPm();
+  size_t getRamsize();
+  void setRamsize(size_t ramsize);
+
+  e_surf_vm_state_t getState();
 
   /* FIXME: protect me */
   simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;