X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85e1d2c205ca99512b48bceca0f16677a401e233..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/plugins/vm/VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 362409a932..d26383456c 100644
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
 
 #include "simgrid/s4u/VirtualMachine.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/surf/HostImpl.hpp"
 #include <algorithm>
 #include <deque>
@@ -13,9 +13,6 @@
 #ifndef VM_INTERFACE_HPP_
 #define VM_INTERFACE_HPP_
 
-#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
-                          // It corresponds to the cost of a VM running no tasks.
-
 namespace simgrid {
 namespace vm {
 
@@ -31,61 +28,47 @@ class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt
   friend simgrid::s4u::VirtualMachine;
 
 public:
-  explicit VirtualMachineImpl(s4u::VirtualMachine * piface, s4u::Host * host, int coreAmount, size_t ramsize);
+  explicit VirtualMachineImpl(s4u::VirtualMachine* piface, s4u::Host* host, int core_amount, size_t ramsize);
   ~VirtualMachineImpl();
 
-  /** @brief Suspend the VM */
-  virtual void suspend(simgrid::kernel::actor::ActorImpl* issuer);
+  /** @brief Callbacks fired after VM creation. Signature: `void(VirtualMachineImpl&)` */
+  static xbt::signal<void(simgrid::vm::VirtualMachineImpl&)> on_creation;
+  /** @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachineImpl const&)` */
+  static xbt::signal<void(simgrid::vm::VirtualMachineImpl const&)> on_destruction;
 
-  /** @brief Resume the VM */
+  virtual void suspend(kernel::actor::ActorImpl* issuer);
   virtual void resume();
-
-  /** @brief Shutdown the VM */
-  virtual void shutdown(simgrid::kernel::actor::ActorImpl* issuer);
+  virtual void shutdown(kernel::actor::ActorImpl* issuer);
 
   /** @brief Change the physical host on which the given VM is running */
-  virtual void setPm(s4u::Host* dest);
+  virtual void set_physical_host(s4u::Host* dest);
+  /** @brief Get the physical host on which the given VM is running */
+  s4u::Host* get_physical_host() { return physical_host_; }
+
+  sg_size_t get_ramsize() const { return ramsize_; }
+  void set_ramsize(sg_size_t ramsize) { ramsize_ = ramsize; }
 
-  /** @brief Get the physical machine hosting the VM */
-  s4u::Host* getPm();
+  s4u::VirtualMachine::state get_state() const { return vm_state_; }
+  void set_state(s4u::VirtualMachine::state state) { vm_state_ = state; }
 
-  sg_size_t getRamsize() { return ramsize_; }
-  void setRamsize(sg_size_t ramsize) { ramsize_ = ramsize; }
+  int get_core_amount() { return core_amount_; }
 
-  virtual void setBound(double bound);
+  virtual void set_bound(double bound);
 
   /* The vm object of the lower layer */
   kernel::resource::Action* action_ = nullptr;
-
-  e_surf_vm_state_t getState();
-  void setState(e_surf_vm_state_t state);
   static std::deque<s4u::VirtualMachine*> allVms_;
-  int coreAmount() { return coreAmount_; }
-
-  bool isMigrating = false;
-  /*************
-   * Callbacks *
-   *************/
-  /** @ingroup SURF_callbacks
-   * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
-   */
-  static simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmCreation;
-
-  /** @ingroup SURF_callbacks
-   * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
-   */
-  static simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmDestruction;
-
-  /** @ingroup SURF_callbacks
-   * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
-   */
-  static simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmStateChange;
+  bool is_migrating_ = false;
+  int active_tasks_ = 0;
+
+  void update_action_weight();
 
 private:
-  simgrid::s4u::Host* hostPM_;
-  int coreAmount_;
+  s4u::Host* physical_host_;
+  int core_amount_;
+  double user_bound_                   = std::numeric_limits<double>::max();
   size_t ramsize_            = 0;
-  e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
+  s4u::VirtualMachine::state vm_state_ = s4u::VirtualMachine::state::CREATED;
 };
 
 /*********
@@ -98,10 +81,14 @@ private:
 class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
   VMModel();
-  void ignore_empty_vm_in_pm_LMM() override{};
 
-  double next_occuring_event(double now) override;
+  double next_occurring_event(double now) override;
   void update_actions_state(double /*now*/, double /*delta*/) override{};
+  kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+                                             const double* bytes_amount, double rate) override
+  {
+    return nullptr;
+  };
 };
 }
 }