Use structured binding declarations (sonar, c++17).

[simgrid.git] / src / kernel / resource / VirtualMachineImpl.hpp

diff --git a/src/kernel/resource/VirtualMachineImpl.hpp b/src/kernel/resource/VirtualMachineImpl.hpp
index 6ab458f0d7008d0e13eef932e5ac81c1079daf03..3628c77f0c7ad36fc847eb2198f56e51f2392074 100644 (file)
--- a/src/kernel/resource/VirtualMachineImpl.hpp
+++ b/src/kernel/resource/VirtualMachineImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2022. 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. */
@@ -21,7 +21,7 @@ namespace resource {
  * Resource *
  ************/
 
-class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public xbt::Extendable<VirtualMachineImpl> {
+class XBT_PUBLIC VirtualMachineImpl : public HostImpl, public xbt::Extendable<VirtualMachineImpl> {
 #ifndef DOXYGEN
   friend s4u::VirtualMachine;
 #endif
@@ -31,8 +31,11 @@ public:
 
   explicit VirtualMachineImpl(const std::string& name, s4u::VirtualMachine* piface, s4u::Host* host, int core_amount,
                               size_t ramsize);
+  explicit VirtualMachineImpl(const std::string& name, simgrid::s4u::Host* host_PM, int core_amount, size_t ramsize);
+  void set_piface(s4u::VirtualMachine* piface);
 
-  void suspend(actor::ActorImpl* issuer);
+  void start();
+  void suspend(const actor::ActorImpl* issuer);
   void resume();
   void shutdown(kernel::actor::ActorImpl* issuer);
   void vm_destroy();
@@ -42,8 +45,8 @@ public:
   /** @brief Get the physical host on which the given VM is running */
   s4u::Host* get_physical_host() const { return physical_host_; }
 
-  sg_size_t get_ramsize() const { return ramsize_; }
-  void set_ramsize(sg_size_t ramsize) { ramsize_ = ramsize; }
+  size_t get_ramsize() const { return ramsize_; }
+  void set_ramsize(size_t ramsize) { ramsize_ = ramsize; }
 
   s4u::VirtualMachine::State get_state() const { return vm_state_; }
   void set_state(s4u::VirtualMachine::State state) { vm_state_ = state; }
@@ -61,12 +64,13 @@ public:
   void add_active_exec() { active_execs_++; }
   void remove_active_exec() { active_execs_--; }
 
-  void start_migration() { is_migrating_ = true; }
-  void end_migration() { is_migrating_ = false; }
+  void start_migration();
+  void end_migration();
   bool is_migrating() const { return is_migrating_; }
+  void seal() override;
 
 private:
-  s4u::VirtualMachine* piface_;
+  s4u::VirtualMachine* piface_ = nullptr;
   Action* action_            = nullptr;
   unsigned int active_execs_ = 0;
   s4u::Host* physical_host_;
@@ -84,12 +88,13 @@ private:
  * @brief SURF VM model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class XBT_PRIVATE VMModel : public surf::HostModel {
+class XBT_PRIVATE VMModel : public HostModel {
 public:
   explicit VMModel(const std::string& name);
 
   double next_occurring_event(double now) override;
   void update_actions_state(double /*now*/, double /*delta*/) override{};
+  Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override;
   Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                            const double* bytes_amount, double rate) override
   {