include cleanups in src/s4u

[simgrid.git] / src / s4u / s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 4831daf..f0183d2 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,78 +1,97 @@
-/* Copyright (c) 2018-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-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. */
 
-#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/Disk.hpp"
-#include "simgrid/s4u/Io.hpp"
-#include "simgrid/s4u/Storage.hpp"
+#include <simgrid/s4u/Disk.hpp>
+#include <simgrid/s4u/Io.hpp>
+#include <xbt/log.h>
+
 #include "src/kernel/activity/IoImpl.hpp"
-#include "xbt/log.h"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
 
 namespace simgrid {
 namespace s4u {
+xbt::signal<void(Io const&)> Io::on_start;
+xbt::signal<void(Io const&)> Io::on_completion;
 
-Io::Io(sg_disk_t disk, sg_size_t size, OpType type) : disk_(disk), size_(size), type_(type)
+Io::Io(kernel::activity::IoImplPtr pimpl)
 {
-  Activity::set_remaining(size_);
-  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  pimpl_ = pimpl;
 }
 
-Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : storage_(storage), size_(size), type_(type)
+void Io::complete(Activity::State state)
 {
-  Activity::set_remaining(size_);
-  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  Activity::complete(state);
+  on_completion(*this);
+}
+
+IoPtr Io::init()
+{
+  auto pimpl = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  return IoPtr(pimpl->get_iface());
 }
 
 Io* Io::start()
 {
-  kernel::actor::simcall([this] {
-    if (storage_) {
-      (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-          .set_name(get_name())
-          .set_storage(storage_->get_impl())
-          .set_size(size_)
-          .set_type(type_)
-          .start();
-    } else {
-      (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-          .set_name(get_name())
-          .set_disk(disk_->get_impl())
-          .set_size(size_)
-          .set_type(type_)
-          .start();
-    }
-  });
+  kernel::actor::simcall(
+      [this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
 
   if (suspended_)
     pimpl_->suspend();
 
   state_ = State::STARTED;
+  on_start(*this);
   return this;
 }
 
-Io* Io::cancel()
+ssize_t Io::wait_any_for(const std::vector<IoPtr>& ios, double timeout)
 {
-  simgrid::kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
-  state_ = State::CANCELED;
-  return this;
+  std::vector<kernel::activity::IoImpl*> rios(ios.size());
+  std::transform(begin(ios), end(ios), begin(rios),
+                 [](const IoPtr& io) { return static_cast<kernel::activity::IoImpl*>(io->pimpl_.get()); });
+
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  kernel::actor::IoWaitanySimcall observer{issuer, rios, timeout};
+  ssize_t changed_pos = kernel::actor::simcall_blocking(
+      [&observer] {
+        kernel::activity::IoImpl::wait_any_for(observer.get_issuer(), observer.get_ios(), observer.get_timeout());
+      },
+      &observer);
+  if (changed_pos != -1)
+    ios.at(changed_pos)->complete(State::FINISHED);
+  return changed_pos;
 }
 
-Io* Io::wait()
+IoPtr Io::set_disk(const_sg_disk_t disk)
 {
-  return this->wait_for(-1);
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set disk once the Io is started");
+
+  kernel::actor::simcall(
+      [this, disk] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_disk(disk->get_impl()); });
+
+  // Setting the disk may allow to start the activity, let's try
+  if (state_ == State::STARTING)
+    vetoable_start();
+
+ return this;
 }
 
-Io* Io::wait_for(double timeout)
+IoPtr Io::set_size(sg_size_t size)
 {
-  if (state_ == State::INITED)
-    vetoable_start();
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
+  Activity::set_remaining(size);
+  return this;
+}
 
-  kernel::actor::ActorImpl* issuer = Actor::self()->get_impl();
-  kernel::actor::simcall_blocking<void>([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); });
-  state_ = State::FINISHED;
-  this->release_dependencies();
+IoPtr Io::set_op_type(OpType type)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, type] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_type(type); });
   return this;
 }
 
@@ -88,5 +107,10 @@ sg_size_t Io::get_performed_ioops() const
   return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops();
 }
 
+bool Io::is_assigned() const
+{
+  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
+}
+
 } // namespace s4u
 } // namespace simgrid