try to clean and uniformize Activity Impls

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

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 41a4cb3..7a89c7b 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2019. 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. */
@@ -6,7 +6,6 @@
 #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");
@@ -14,11 +13,21 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
 namespace simgrid {
 namespace s4u {
 
-Io* Io::start()
+Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : storage_(storage), size_(size), type_(type)
 {
   Activity::set_remaining(size_);
-  pimpl_ = simix::simcall([this] {
-    return boost::static_pointer_cast<kernel::activity::IoImpl>(SIMIX_io_start(name_, size_, storage_, type_));
+  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+}
+
+Io* Io::start()
+{
+  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;
@@ -26,7 +35,7 @@ Io* Io::start()
 
 Io* Io::cancel()
 {
-  simgrid::simix::simcall([this] { dynamic_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;
 }
@@ -38,10 +47,9 @@ Io* Io::wait()
   return this;
 }
 
-Io* Io::wait_for(double timeout)
+Io* Io::wait_for(double)
 {
   THROW_UNIMPLEMENTED;
-  return this;
 }
 
 bool Io::test()
@@ -56,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(); });
 }