X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8a66c743439c94d5de5bcb8a3e50dcd207b6d2f..09392faf42646e631a4e42553e901410eb3e488e:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 81dafc905b..0709a3b50c 100644
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2023. 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. */
@@ -11,8 +11,7 @@
 
 #include <string>
 
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
 
 /** I/O Activity, representing the asynchronous disk access.
  *
@@ -25,23 +24,23 @@ class XBT_PUBLIC Io : public Activity_T<Io> {
   friend kernel::EngineImpl;
 #endif
 
-  static xbt::signal<void(Io const&)> on_start;
-
 protected:
   explicit Io(kernel::activity::IoImplPtr pimpl);
+  Io* do_start() override;
+
+  static ssize_t deprecated_wait_any_for(const std::vector<IoPtr>& ios, double timeout); // XBT_ATTRIB_DEPRECATED_v339
 
 public:
   enum class OpType { READ, WRITE };
 
-  static void on_start_cb(const std::function<void(Io const&)>& cb) { on_start.connect(cb); }
-
+   /*! \static Initiate the creation of an I/O. Setters have to be called afterwards */
   static IoPtr init();
-  Io* start() override;
-  /*! take a vector of s4u::IoPtr and return when one of them is finished.
-   * The return value is the rank of the first finished IoPtr. */
-  static ssize_t wait_any(const std::vector<IoPtr>& ios) { return wait_any_for(ios, -1); }
-  /*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
-  static ssize_t wait_any_for(const std::vector<IoPtr>& ios, double timeout);
+#ifndef DOXYGEN
+  XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") 
+  static ssize_t wait_any(const std::vector<IoPtr>& ios) { return deprecated_wait_any_for(ios, -1); }
+  XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") 
+  static ssize_t wait_any_for(const std::vector<IoPtr>& ios, double timeout) { return deprecated_wait_any_for(ios, timeout); }
+#endif
 
   double get_remaining() const override;
   sg_size_t get_performed_ioops() const;
@@ -50,19 +49,20 @@ public:
   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);
+  static IoPtr streamto_init(Host* from, const Disk* from_disk, Host* to, const Disk* to_disk);
+  static IoPtr streamto_async(Host* from, const Disk* from_disk, Host* to, const Disk* to_disk,
+                              uint64_t simulated_size_in_bytes);
+  static void streamto(Host* from, const Disk* from_disk, Host* to, const 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 set_source(Host* from, const Disk* from_disk);
+  IoPtr set_destination(Host* to, const Disk* to_disk);
 
   IoPtr update_priority(double priority);
 
   bool is_assigned() const override;
 };
 
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_IO_HPP */