X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98236eba13100727f2421d07b097cf84416ef74e..ea74f5d95928a521a588737e81f1de94eef25d19:/src/kernel/activity/IoImpl.hpp

diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp
index cbc2f0d185..7c794f7da0 100644
--- a/src/kernel/activity/IoImpl.hpp
+++ b/src/kernel/activity/IoImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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. */
@@ -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,26 +14,31 @@ 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::DiskImpl* disk_           = nullptr;
+  double sharing_penalty_             = 1.0;
+  sg_size_t size_                     = 0;
+  s4u::Io::OpType type_               = s4u::Io::OpType::READ;
+  sg_size_t performed_ioops_          = 0;
+  resource::Action* timeout_detector_ = nullptr;
 public:
+  IoImpl();
+
+  IoImpl& set_sharing_penalty(double sharing_penalty);
+  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_; }
+  IoImpl& update_sharing_penalty(double sharing_penalty);
+
+  sg_size_t get_performed_ioops() const { return performed_ioops_; }
+  resource::DiskImpl* get_disk() const { return disk_; }
 
   IoImpl* start();
   void post() override;
+  void set_exception(actor::ActorImpl* issuer) override;
   void finish() override;
-
-  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