Kill the now useless type xbt::string

[simgrid.git] / src / surf / HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index e9a291c..13c0772 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -9,14 +9,11 @@
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
-#include "src/kernel/resource/LinkImpl.hpp"
 #include <xbt/PropertyHolder.hpp>
 
 #include <vector>
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 /*********
  * Model *
  *********/
@@ -32,6 +29,7 @@ public:
 
   virtual Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                                    const double* bytes_amount, double rate) = 0;
+  virtual Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) = 0;
 };
 
 /************
@@ -51,13 +49,13 @@ class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
   std::vector<actor::ProcessArg*> actors_at_boot_;
   s4u::Host piface_;
   std::map<std::string, DiskImpl*, std::less<>> disks_;
-  xbt::string name_{"noname"};
+  std::map<std::string, VirtualMachineImpl*, std::less<>> vms_;
+  std::string name_{"noname"};
   routing::NetZoneImpl* englobing_zone_ = nullptr;
   bool sealed_ = false;
 
 protected:
   virtual ~HostImpl(); // Use destroy() instead of this destructor.
-  HostImpl(const std::string& name, s4u::Host* piface);
 
 public:
   friend VirtualMachineImpl;
@@ -67,14 +65,21 @@ public:
 
   std::vector<s4u::Disk*> get_disks() const;
   s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth);
+  s4u::VirtualMachine* create_vm(const std::string& name, int core_amount, size_t ramsize = 1024);
+  s4u::VirtualMachine* create_vm(const std::string& name, s4u::VirtualMachine* vm);
+  void destroy_vm(const std::string& name);
   void add_disk(const s4u::Disk* disk);
   void remove_disk(const std::string& name);
+  /** @brief Moves VM from this host to destination. Only sets the vm_ accordingly */
+  void move_vm(VirtualMachineImpl* vm, HostImpl* destination);
+  std::vector<s4u::VirtualMachine*> get_vms() const;
+  VirtualMachineImpl* get_vm_by_name_or_null(const std::string& name) const;
 
   virtual const s4u::Host* get_iface() const { return &piface_; }
   virtual s4u::Host* get_iface() { return &piface_; }
 
   /** Retrieves the name of that host as a C++ string */
-  xbt::string const& get_name() const { return name_; }
+  std::string const& get_name() const { return name_; }
   /** Retrieves the name of that host as a C string */
   const char* get_cname() const { return name_.c_str(); }
 
@@ -90,7 +95,7 @@ public:
   void remove_actor(actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); }
   void add_actor_at_boot(actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); }
 
-  void seal();
+  virtual void seal();
 
   template <class F> void foreach_actor(F function)
   {
@@ -98,8 +103,6 @@ public:
       function(actor);
   }
 };
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 
 #endif /* HOST_INTERFACE_HPP */