X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2558c8c0eb206ff353cb88672f5a90cd0e2562d3..b7c53df18dcbf388f0dce6d7baa3086436028313:/src/kernel/activity/IoImpl.hpp

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index 102b691bfe..3bd9c7b5cc 100644
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -1,41 +1,42 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
 
-#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"
 #include <simgrid/s4u/Io.hpp>
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-class XBT_PUBLIC IoImpl : public ActivityImpl {
-  resource::StorageImpl* storage_ = nullptr;
+class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
+  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& set_name(const std::string& name);
+  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() { return performed_ioops_; }
+  sg_size_t get_performed_ioops() const { return performed_ioops_; }
+  resource::DiskImpl* get_disk() const { return disk_; }
 
   IoImpl* start();
   void post() override;
   void finish() override;
-  void cancel();
-  double get_remaining();
-
-  static xbt::signal<void(IoImpl const&)> on_start;
-  static xbt::signal<void(IoImpl const&)> on_completion;
+  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<IoImpl*>& ios, double timeout);
 };
 } // namespace activity
 } // namespace kernel