X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..d94f920eb99dc33e8c592e89bcbbb3a8e50fe919:/src/s4u/s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 71326434ad..6d34be90e0 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -11,6 +11,8 @@
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous I/Os");
+
 namespace simgrid::s4u {
 xbt::signal<void(Io const&)> Io::on_start;
 
@@ -25,6 +27,61 @@ IoPtr Io::init()
   return IoPtr(static_cast<Io*>(pimpl->get_iface()));
 }
 
+IoPtr Io::streamto_init(Host* from, Disk* from_disk, Host* to, Disk* to_disk)
+{
+  auto res = Io::init()->set_source(from, from_disk)->set_destination(to, to_disk);
+  res->set_state(State::STARTING);
+  return res;
+}
+
+IoPtr Io::streamto_async(Host* from, Disk* from_disk, Host* to, Disk* to_disk, uint64_t simulated_size_in_bytes)
+{
+  return Io::init()->set_size(simulated_size_in_bytes)->set_source(from, from_disk)->set_destination(to, to_disk);
+}
+
+void Io::streamto(Host* from, Disk* from_disk, Host* to, Disk* to_disk, uint64_t simulated_size_in_bytes)
+{
+  streamto_async(from, from_disk, to, to_disk, simulated_size_in_bytes)->wait();
+}
+
+IoPtr Io::set_source(Host* from, Disk* from_disk)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the source of an IO stream once it's started (state: %s)", to_c_str(state_));
+  kernel::actor::simcall_answered(
+      [this, from, from_disk] {
+        boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_host(from);
+        if (from_disk != nullptr)
+          boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_disk(from_disk->get_impl());
+      });
+  // Setting 'source' may allow to start the activity, let's try
+  if (state_ == State::STARTING && remains_ <= 0)
+    XBT_DEBUG("This IO has a size of 0 byte. It cannot start yet");
+  else
+    vetoable_start();
+
+  return this;
+}
+
+IoPtr Io::set_destination(Host* to, Disk* to_disk)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the source of an IO stream once it's started (state: %s)", to_c_str(state_));
+  kernel::actor::simcall_answered(
+      [this, to, to_disk] {
+        boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_dst_host(to);
+        if (to_disk != nullptr)
+          boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_dst_disk(to_disk->get_impl());
+      });
+  // Setting 'destination' may allow to start the activity, let's try
+  if (state_ == State::STARTING && remains_ <= 0)
+    XBT_DEBUG("This IO has a size of 0 byte. It cannot start yet");
+  else
+    vetoable_start();
+
+  return this;
+}
+
 Io* Io::start()
 {
   kernel::actor::simcall_answered(
@@ -75,7 +132,7 @@ IoPtr Io::set_size(sg_size_t size)
   xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
   kernel::actor::simcall_answered(
       [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
-  Activity::set_remaining(size);
+  set_remaining(size);
   return this;
 }
 
@@ -109,7 +166,11 @@ sg_size_t Io::get_performed_ioops() const
 
 bool Io::is_assigned() const
 {
-  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
+  if (boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_host() == nullptr) {
+    return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
+  } else {
+    return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_dst_host() != nullptr;
+  }
 }
 
 } // namespace simgrid::s4u