X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a47ce47003f276edbe70d6b0536f0f32c96ae212..ef753f4a6180065885bb97ce20ea62f4cc6bcc1c:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 944844b2c2..8690555fd2 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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. */
@@ -13,9 +13,7 @@
 
 #include <vector>
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 /*********
  * Model *
  *********/
@@ -31,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;
 };
 
 /************
@@ -40,7 +39,7 @@ public:
  * @brief SURF Host interface class
  * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s)
  */
-class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
+class XBT_PRIVATE HostImpl : public xbt::PropertyHolder, public actor::ObjectAccessSimcallItem {
   using ActorList =
       boost::intrusive::list<actor::ActorImpl,
                              boost::intrusive::member_hook<actor::ActorImpl, boost::intrusive::list_member_hook<>,
@@ -51,7 +50,7 @@ class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
   s4u::Host piface_;
   std::map<std::string, DiskImpl*, std::less<>> disks_;
   std::map<std::string, VirtualMachineImpl*, std::less<>> vms_;
-  xbt::string name_{"noname"};
+  std::string name_{"noname"};
   routing::NetZoneImpl* englobing_zone_ = nullptr;
   bool sealed_ = false;
 
@@ -67,6 +66,7 @@ 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);
@@ -79,7 +79,7 @@ public:
   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(); }
 
@@ -103,8 +103,6 @@ public:
       function(actor);
   }
 };
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 
 #endif /* HOST_INTERFACE_HPP */