X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/239a6c2b5cf6df25b93d95b5df30fb5fbacbfbcd..93ae3804979dbbefc774e5a70acc32a4407dd7e8:/src/s4u/s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 52f55b4322..9d467c7004 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -16,20 +16,26 @@ namespace s4u {
 Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : Activity(), storage_(storage), size_(size), type_(type)
 {
   Activity::set_remaining(size_);
-  pimpl_ = simix::simcall(
-      [this] { return kernel::activity::IoImplPtr(new kernel::activity::IoImpl(name_, storage_->get_impl())); });
+  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
 }
 
 Io* Io::start()
 {
-  simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->start(size_, type_); });
+  simix::simcall([this] {
+    boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)
+        ->set_name(name_)
+        ->set_storage(storage_->get_impl())
+        ->set_size(size_)
+        ->set_type(type_)
+        ->start();
+  });
   state_ = State::STARTED;
   return this;
 }
 
 Io* Io::cancel()
 {
-  simgrid::simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->cancel(); });
+  simgrid::simix::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
   state_ = State::CANCELED;
   return this;
 }
@@ -44,7 +50,6 @@ Io* Io::wait()
 Io* Io::wait_for(double)
 {
   THROW_UNIMPLEMENTED;
-  return this;
 }
 
 bool Io::test()
@@ -59,19 +64,19 @@ bool Io::test()
 
   THROW_UNIMPLEMENTED;
 
-  return false;
+  // return false
 }
 
 /** @brief Returns the amount of flops that remain to be done */
 double Io::get_remaining()
 {
-  return simgrid::simix::simcall(
+  return simix::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
 }
 
 sg_size_t Io::get_performed_ioops()
 {
-  return simgrid::simix::simcall(
+  return simix::simcall(
       [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
 }