Merge with framagit/master

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

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 0b885d3..df8bf13 100644 (file)
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -23,17 +23,12 @@ class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
   resource::Action* timeout_detector_ = nullptr;
 
 public:
+  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);
 
-  void set_timeout_detector(resource::Action* action)
-  {
-    timeout_detector_ = action;
-    timeout_detector_->set_activity(this);
-  }
-
   sg_size_t get_performed_ioops() const { return performed_ioops_; }
   resource::DiskImpl* get_disk() const { return disk_; }
   resource::StorageImpl* get_storage() const { return storage_; }
@@ -41,9 +36,6 @@ public:
   IoImpl* start();
   void post() override;
   void finish() override;
-
-  static xbt::signal<void(IoImpl const&)> on_start;
-  static xbt::signal<void(IoImpl const&)> on_completion;
 };
 } // namespace activity
 } // namespace kernel