Merge branch 'fluidio' into 'master'

[simgrid.git] / include / simgrid / s4u / Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 1e7825b..81dafc9 100644 (file)
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-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. */
@@ -22,18 +22,18 @@ namespace s4u {
 class XBT_PUBLIC Io : public Activity_T<Io> {
 #ifndef DOXYGEN
   friend kernel::activity::IoImpl;
+  friend kernel::EngineImpl;
 #endif
 
+  static xbt::signal<void(Io const&)> on_start;
+
 protected:
   explicit Io(kernel::activity::IoImplPtr pimpl);
 
-  void complete(Activity::State state) override;
-
 public:
   enum class OpType { READ, WRITE };
 
-  static xbt::signal<void(Io const&)> on_start;
-  static xbt::signal<void(Io const&)> on_completion;
+  static void on_start_cb(const std::function<void(Io const&)>& cb) { on_start.connect(cb); }
 
   static IoPtr init();
   Io* start() override;
@@ -46,9 +46,19 @@ public:
   double get_remaining() const override;
   sg_size_t get_performed_ioops() const;
   IoPtr set_disk(const_sg_disk_t disk);
+  IoPtr set_priority(double priority);
   IoPtr set_size(sg_size_t size);
   IoPtr set_op_type(OpType type);
 
+  static IoPtr streamto_init(Host* from, Disk* from_disk, Host* to, Disk* to_disk);
+  static IoPtr streamto_async(Host* from, Disk* from_disk, Host* to, Disk* to_disk, uint64_t simulated_size_in_bytes);
+  static void streamto(Host* from, Disk* from_disk, Host* to, Disk* to_disk, uint64_t simulated_size_in_bytes);
+
+  IoPtr set_source(Host* from, Disk* from_disk);
+  IoPtr set_destination(Host* to, Disk* to_disk);
+
+  IoPtr update_priority(double priority);
+
   bool is_assigned() const override;
 };