X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93ae3804979dbbefc774e5a70acc32a4407dd7e8..7b0e03ac48be8e014d877060fbd385201b1b896f:/src/kernel/activity/IoImpl.hpp

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 5e50b88178..cbc2f0d185 100644
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -3,8 +3,8 @@
 /* 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. */
 
-#ifndef SIMIX_SYNCHRO_IO_HPP
-#define SIMIX_SYNCHRO_IO_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_IO_HPP
+#define SIMGRID_KERNEL_ACTIVITY_IO_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "surf/surf.hpp"
@@ -14,31 +14,27 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-class XBT_PUBLIC IoImpl : public ActivityImpl {
+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;
 
 public:
-  ~IoImpl() override;
-  IoImpl() = default;
-
-  IoImplPtr set_name(const std::string& name);
-  IoImplPtr set_size(sg_size_t size);
-  IoImplPtr set_type(s4u::Io::OpType type);
-  IoImplPtr set_storage(resource::StorageImpl* storage);
+  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() { return performed_ioops_; }
 
   IoImpl* start();
   void post() override;
   void finish() override;
-  void cancel();
-  double get_remaining();
 
-  static xbt::signal<void(IoImplPtr)> on_start;
-  static xbt::signal<void(IoImplPtr)> on_completion;
+  static xbt::signal<void(IoImpl const&)> on_start;
+  static xbt::signal<void(IoImpl const&)> on_completion;
 };
 } // namespace activity
 } // namespace kernel