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

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 88d78a7040..25cb01261e 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -16,8 +16,10 @@ namespace s4u {
 
 Activity* Io::start()
 {
-  set_remaining(size_);
-  pimpl_ = simix::simcall([this] { return SIMIX_io_start(name_, size_, storage_, type_); });
+  Activity::set_remaining(size_);
+  pimpl_ = simix::simcall([this] {
+    return boost::static_pointer_cast<kernel::activity::IoImpl>(SIMIX_io_start(name_, size_, storage_, type_));
+  });
   state_ = State::STARTED;
   return this;
 }
@@ -36,12 +38,27 @@ Activity* Io::wait()
   return this;
 }
 
-Activity* Io::wait(double timeout)
+Activity* Io::wait_for(double timeout)
 {
   THROW_UNIMPLEMENTED;
   return this;
 }
 
+bool Io::test()
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
+
+  if (state_ == State::FINISHED)
+    return true;
+
+  if (state_ == State::INITED)
+    this->start();
+
+  THROW_UNIMPLEMENTED;
+
+  return false;
+}
+
 /** @brief Returns the amount of flops that remain to be done */
 double Io::get_remaining()
 {
@@ -55,13 +72,6 @@ sg_size_t Io::get_performed_ioops()
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
 }
 
-IoPtr Io::set_io_type(OpType type)
-{
-  xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start");
-  type_ = type;
-  return this;
-}
-
 void intrusive_ptr_release(simgrid::s4u::Io* i)
 {
   if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {