X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15479dbe435febdbec7411e8de9b11bac1ca9350..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/s4u/s4u_Io.cpp?ds=sidebyside

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 4cf33bc8d4..9b363ce0d1 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2020. 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. */
@@ -9,8 +9,6 @@
 #include "src/kernel/activity/IoImpl.hpp"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
-
 namespace simgrid {
 namespace s4u {
 
@@ -31,14 +29,14 @@ Io* Io::start()
   kernel::actor::simcall([this] {
     if (storage_) {
       (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-          .set_name(name_)
+          .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(name_)
+          .set_name(get_name())
           .set_disk(disk_->get_impl())
           .set_size(size_)
           .set_type(type_)
@@ -58,14 +56,14 @@ Io* Io::cancel()
 
 Io* Io::wait()
 {
-  simcall_io_wait(pimpl_);
-  state_ = State::FINISHED;
-  return this;
+  return this->wait_for(-1);
 }
 
-Io* Io::wait_for(double)
+Io* Io::wait_for(double timeout)
 {
-  THROW_UNIMPLEMENTED;
+  simcall_io_wait(pimpl_, timeout);
+  state_ = State::FINISHED;
+  return this;
 }
 
 bool Io::test()
@@ -78,9 +76,12 @@ bool Io::test()
   if (state_ == State::INITED)
     this->start();
 
-  THROW_UNIMPLEMENTED;
+  if (simcall_io_test(pimpl_)) {
+    state_ = State::FINISHED;
+    return true;
+  }
 
-  // return false
+  return false;
 }
 
 /** @brief Returns the amount of flops that remain to be done */
@@ -96,17 +97,5 @@ sg_size_t Io::get_performed_ioops()
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
 }
 
-void intrusive_ptr_release(simgrid::s4u::Io* i)
-{
-  if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    delete i;
-  }
-}
-
-void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
-{
-  i->refcount_.fetch_add(1, std::memory_order_relaxed);
-}
 } // namespace s4u
 } // namespace simgrid