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

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 4dfbfa2c03..25cb01261e 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -6,6 +6,7 @@
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "src/kernel/activity/IoImpl.hpp"
+#include "src/simix/smx_io_private.hpp"
 #include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
@@ -15,7 +16,10 @@ namespace s4u {
 
 Activity* Io::start()
 {
-  pimpl_ = simcall_io_start("", size_, storage_);
+  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;
 }
@@ -29,61 +33,56 @@ Activity* Io::cancel()
 
 Activity* Io::wait()
 {
-  //  simcall_execution_wait(pimpl_);
+  simcall_io_wait(pimpl_);
   state_ = State::FINISHED;
   return this;
 }
 
-Activity* Io::wait(double timeout)
+Activity* Io::wait_for(double timeout)
 {
   THROW_UNIMPLEMENTED;
   return this;
 }
-//
-///** @brief Returns whether the state of the exec is finished */
-// bool Exec::test()
-//{
-//  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
-//
-//  if (state_ == State::FINISHED)
-//    return true;
-//
-//  if (state_ == State::INITED)
-//    this->start();
-//
-//  if (simcall_execution_test(pimpl_)) {
-//    state_ = State::FINISHED;
-//    return true;
-//  }
-//
-//  return false;
-//}
+
+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()
 {
   return simgrid::simix::simcall(
-      [this]() { return boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
+      [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
 }
 
-// double Io::get_remaining_ratio()
-//{
-//  return simgrid::simix::simcall([this]() {
-//    return boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(pimpl_)->get_remaining_ratio();
-//  });
-//}
+sg_size_t Io::get_performed_ioops()
+{
+  return simgrid::simix::simcall(
+      [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
+}
 
-void intrusive_ptr_release(simgrid::s4u::Io* e)
+void intrusive_ptr_release(simgrid::s4u::Io* i)
 {
-  if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+  if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
     std::atomic_thread_fence(std::memory_order_acquire);
-    delete e;
+    delete i;
   }
 }
 
-void intrusive_ptr_add_ref(simgrid::s4u::Io* e)
+void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
 {
-  e->refcount_.fetch_add(1, std::memory_order_relaxed);
+  i->refcount_.fetch_add(1, std::memory_order_relaxed);
 }
 } // namespace s4u
 } // namespace simgrid