more include cleanups

[simgrid.git] / src / kernel / activity / IoImpl.hpp

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index e1ed124f572225fece2b3e5df6bd99b892d5e7c5..3bd9c7b5ccc8b4b347785c94f3b6939642d803d9 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_KERNEL_ACTIVITY_IO_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
-#include "surf/surf.hpp"
 #include <simgrid/s4u/Io.hpp>
 
 namespace simgrid {
@@ -15,27 +14,29 @@ namespace kernel {
 namespace activity {
 
 class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
-  resource::StorageImpl* storage_ = nullptr;
   resource::DiskImpl* disk_       = nullptr;
   sg_size_t size_                 = 0;
   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);
-  IoImpl& set_storage(resource::StorageImpl* storage);
   IoImpl& set_disk(resource::DiskImpl* disk);
 
   sg_size_t get_performed_ioops() const { return performed_ioops_; }
   resource::DiskImpl* get_disk() const { return disk_; }
-  resource::StorageImpl* get_storage() const { return storage_; }
 
   IoImpl* start();
   void post() override;
   void finish() override;
+  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<IoImpl*>& ios, double timeout);
 };
 } // namespace activity
 } // namespace kernel