Update copyright lines with new year.

[simgrid.git] / src / plugins / vm / VirtualMachineImpl.hpp

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 3db713d..5d73502 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. 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. */
@@ -53,8 +53,8 @@ public:
   sg_size_t get_ramsize() { return ramsize_; }
   void set_ramsize(sg_size_t ramsize) { ramsize_ = ramsize; }
 
-  e_surf_vm_state_t get_state() { return vm_state_; }
-  void set_state(e_surf_vm_state_t state) { vm_state_ = state; }
+  s4u::VirtualMachine::state get_state() { return vm_state_; }
+  void set_state(s4u::VirtualMachine::state state) { vm_state_ = state; }
 
   int get_core_amount() { return core_amount_; }
 
@@ -64,12 +64,16 @@ public:
   kernel::resource::Action* action_ = nullptr;
   static std::deque<s4u::VirtualMachine*> allVms_;
   bool is_migrating_ = false;
+  int active_tasks_ = 0;
+
+  void update_action_weight();
 
 private:
   s4u::Host* physical_host_;
   int core_amount_;
+  double user_bound_;
   size_t ramsize_            = 0;
-  e_surf_vm_state_t vm_state_ = SURF_VM_STATE_CREATED;
+  s4u::VirtualMachine::state vm_state_ = s4u::VirtualMachine::state::CREATED;
 };
 
 /*********
@@ -82,7 +86,6 @@ 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;
   void update_actions_state(double /*now*/, double /*delta*/) override{};