X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/864618094efa422a18a6e4837b234f5b5a940652..1637938a79546eb0b858a3e8ae3b28bd4af96ea4:/src/plugins/vm/VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 39487a8e60..5d735021ed 100644
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. 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,6 +6,9 @@
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/surf/HostImpl.hpp"
+#include <algorithm>
+#include <deque>
+#include <unordered_map>
 
 #ifndef VM_INTERFACE_HPP_
 #define VM_INTERFACE_HPP_
@@ -16,32 +19,6 @@
 namespace simgrid {
 namespace vm {
 
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE VMModel;
-XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
-
-/*************
- * Callbacks *
- *************/
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
- */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmCreation;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
- */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmDestruction;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
- */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> onVmStateChange;
-
 /************
  * Resource *
  ************/
@@ -50,61 +27,53 @@ extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::vm::VirtualMachineImpl*)>
  * @brief SURF VM interface class
  * @details A VM represent a virtual machine
  */
-XBT_PUBLIC_CLASS VirtualMachineImpl : public surf::HostImpl
-{
+class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl> {
   friend simgrid::s4u::VirtualMachine;
 
 public:
-  explicit VirtualMachineImpl(s4u::VirtualMachine * piface, s4u::Host * host, int coreAmount);
+  explicit VirtualMachineImpl(s4u::VirtualMachine* piface, s4u::Host* host, int core_amount, size_t ramsize);
   ~VirtualMachineImpl();
 
-  /** @brief Suspend the VM */
-  virtual void suspend(simgrid::simix::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*)` */
+  static xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> on_destruction;
+  /** @brief Callbacks after VM State changes. Signature: `void(VirtualMachineImpl*)` */
+  static xbt::signal<void(simgrid::vm::VirtualMachineImpl*)> on_state_change;
 
-  /** @brief Resume the VM */
+  virtual void suspend(kernel::actor::ActorImpl* issuer);
   virtual void resume();
-
-  /** @brief Shutdown the VM */
-  virtual void shutdown(simgrid::simix::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_; }
 
-  /** @brief Get the physical machine hosting the VM */
-  s4u::Host* getPm();
+  sg_size_t get_ramsize() { return ramsize_; }
+  void set_ramsize(sg_size_t ramsize) { ramsize_ = ramsize; }
 
-  sg_size_t getRamsize();
+  s4u::VirtualMachine::state get_state() { return vm_state_; }
+  void set_state(s4u::VirtualMachine::state state) { vm_state_ = state; }
 
-  virtual void setBound(double bound);
+  int get_core_amount() { return core_amount_; }
 
-  void getParams(vm_params_t params);
-  void setParams(vm_params_t params);
+  virtual void set_bound(double bound);
 
   /* The vm object of the lower layer */
-  surf::Action* action_ = nullptr;
-
-  /* Dirty pages stuff */
-  int dp_enabled                     = 0;
-  xbt_dict_t dp_objs                 = nullptr;
-  double dp_updated_by_deleted_tasks = 0;
-
-protected:
-  simgrid::s4u::Host* hostPM_;
-
-public:
-  e_surf_vm_state_t getState();
-  void setState(e_surf_vm_state_t state);
+  kernel::resource::Action* action_ = nullptr;
   static std::deque<s4u::VirtualMachine*> allVms_;
-  int coreAmount() { return coreAmount_; }
+  bool is_migrating_ = false;
+  int active_tasks_ = 0;
 
-  bool isMigrating = false;
+  void update_action_weight();
 
 private:
-  s_vm_params_t params_;
-  int coreAmount_;
-
-protected:
-  e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
+  s4u::Host* physical_host_;
+  int core_amount_;
+  double user_bound_;
+  size_t ramsize_            = 0;
+  s4u::VirtualMachine::state vm_state_ = s4u::VirtualMachine::state::CREATED;
 };
 
 /*********
@@ -114,16 +83,16 @@ protected:
  * @brief SURF VM model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class VMModel : public surf::HostModel {
+class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
-  void ignoreEmptyVmInPmLMM() override{};
+  VMModel();
 
-  double nextOccuringEvent(double now) override;
-  void updateActionsState(double /*now*/, double /*delta*/) override{};
+  double next_occuring_event(double now) override;
+  void update_actions_state(double /*now*/, double /*delta*/) override{};
 };
 }
 }
 
-XBT_PUBLIC_DATA(simgrid::vm::VMModel*) surf_vm_model;
+XBT_PUBLIC_DATA simgrid::vm::VMModel* surf_vm_model;
 
 #endif /* VM_INTERFACE_HPP_ */