[sonar] fix a few recently introduced smells

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

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index a12b01f..7015fc6 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
@@ -28,38 +28,39 @@ namespace vm {
  * @details A VM represent a virtual machine
  */
 class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl> {
+#ifndef DOXYGEN
   friend simgrid::s4u::VirtualMachine;
+#endif
 
 public:
-  /** @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;
-
   static std::deque<s4u::VirtualMachine*> allVms_;
 
-  explicit VirtualMachineImpl(s4u::VirtualMachine* piface, s4u::Host* host, int core_amount, size_t ramsize);
-  ~VirtualMachineImpl();
+  explicit VirtualMachineImpl(const std::string& name, s4u::VirtualMachine* piface, s4u::Host* host, int core_amount,
+                              size_t ramsize);
 
-  virtual void suspend(kernel::actor::ActorImpl* issuer);
-  virtual void resume();
-  virtual void shutdown(kernel::actor::ActorImpl* issuer);
+  void suspend(kernel::actor::ActorImpl* issuer);
+  void resume();
+  void shutdown(kernel::actor::ActorImpl* issuer);
+  void vm_destroy();
 
   /** @brief Change the physical host on which the given VM is running */
-  virtual void set_physical_host(s4u::Host* dest);
+  void set_physical_host(s4u::Host* dest);
   /** @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; }
 
-  s4u::VirtualMachine::state get_state() const { return vm_state_; }
-  void set_state(s4u::VirtualMachine::state state) { vm_state_ = state; }
+  s4u::VirtualMachine::State get_state() const { return vm_state_; }
+  void set_state(s4u::VirtualMachine::State state) { vm_state_ = state; }
 
   unsigned int get_core_amount() const { return core_amount_; }
   kernel::resource::Action* get_action() const { return action_; }
 
-  virtual void set_bound(double bound);
+  const s4u::VirtualMachine* get_iface() const override { return piface_; }
+  s4u::VirtualMachine* get_iface() override { return piface_; }
+
+  void set_bound(double bound);
 
   void update_action_weight();
 
@@ -71,13 +72,14 @@ public:
   bool is_migrating() const { return is_migrating_; }
 
 private:
+  s4u::VirtualMachine* piface_;
   kernel::resource::Action* action_ = nullptr;
   unsigned int active_execs_        = 0;
   s4u::Host* physical_host_;
   unsigned int core_amount_;
   double user_bound_                   = std::numeric_limits<double>::max();
   size_t ramsize_                      = 0;
-  s4u::VirtualMachine::state vm_state_ = s4u::VirtualMachine::state::CREATED;
+  s4u::VirtualMachine::State vm_state_ = s4u::VirtualMachine::State::CREATED;
   bool is_migrating_                   = false;
 };
 
@@ -90,7 +92,7 @@ private:
  */
 class XBT_PRIVATE VMModel : public surf::HostModel {
 public:
-  VMModel();
+  explicit VMModel(const std::string& name);
 
   double next_occurring_event(double now) override;
   void update_actions_state(double /*now*/, double /*delta*/) override{};
@@ -100,9 +102,7 @@ public:
     return nullptr;
   };
 };
-}
-}
-
-XBT_PUBLIC_DATA simgrid::vm::VMModel* surf_vm_model;
+} // namespace vm
+} // namespace simgrid
 
 #endif /* VM_INTERFACE_HPP_ */