Match Io and Exec creation

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index a0108a8..6137056 100644 (file)
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -20,10 +20,10 @@ namespace s4u {
  */
 
 class XBT_PUBLIC Io : public Activity_T<Io> {
-#ifndef DOXYGEN
-  friend Disk;    // Factory of IOs
-#endif
-  Io();
+  friend kernel::activity::IoImpl;
+
+protected:
+  explicit Io(kernel::activity::IoImplPtr pimpl);
 
 public:
   enum class OpType { READ, WRITE };

diff --git a/src/kernel/activity/IoImpl.cpp b/src/kernel/activity/IoImpl.cpp
index 80fd2f0..cdc88bf 100644 (file)
--- a/src/kernel/activity/IoImpl.cpp
+++ b/src/kernel/activity/IoImpl.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/Exception.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Io.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/simix/smx_private.hpp"
@@ -18,6 +19,11 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
+IoImpl::IoImpl()
+{
+  piface_ = new s4u::Io(this);
+}
+
 IoImpl& IoImpl::set_timeout(double timeout)
 {
   const s4u::Host* host = get_disk()->get_host();

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 298b88b..fc4df57 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -20,8 +20,12 @@ class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
   s4u::Io::OpType type_           = s4u::Io::OpType::READ;
   sg_size_t performed_ioops_      = 0;
   resource::Action* timeout_detector_ = nullptr;
+  s4u::Io* piface_;
 
 public:
+  IoImpl();
+  s4u::Io* get_iface() { return piface_; }
+
   IoImpl& set_timeout(double timeout) override;
   IoImpl& set_size(sg_size_t size);
   IoImpl& set_type(s4u::Io::OpType type);

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index bd2b722..8af99e8 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -15,14 +15,15 @@ namespace s4u {
 xbt::signal<void(Io const&)> Io::on_start;
 xbt::signal<void(Io const&)> Io::on_completion;
 
-Io::Io()
+Io::Io(kernel::activity::IoImplPtr pimpl)
 {
-  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  pimpl_ = pimpl;
 }
 
 IoPtr Io::init()
 {
- return IoPtr(new Io());
+  auto pimpl = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
+  return IoPtr(pimpl->get_iface());
 }
 
 Io* Io::start()