X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/268f33a4d5bc5c8eca704ce3028e4e3c283fdb02..184f0e36afb128db3cc35349d699b86f977c2820:/include/simgrid/s4u/Comm.hpp

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index 60705438ff..366d38babf 100644
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-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. */
@@ -37,6 +37,7 @@ class XBT_PUBLIC Comm : public Activity_T<Comm> {
   std::function<void(kernel::activity::CommImpl*, void*, size_t)> copy_data_function_;
 
   Comm() = default;
+  Comm* do_start() override;
 
 public:
   /* signals and related callbacks */
@@ -45,17 +46,18 @@ public:
   static xbt::signal<void(Comm const&)> on_send;
   static xbt::signal<void(Comm const&)> on_recv;
   static xbt::signal<void(Comm const&)> on_start;
-  static xbt::signal<void(Comm const&)> on_completion;
 #endif
 
   static void on_send_cb(const std::function<void(Comm const&)>& cb) { on_send.connect(cb); }
   static void on_recv_cb(const std::function<void(Comm const&)>& cb) { on_recv.connect(cb); }
   static void on_start_cb(const std::function<void(Comm const&)>& cb) { on_start.connect(cb); }
-  static void on_completion_cb(const std::function<void(Activity const&)>& cb) { on_completion.connect(cb); }
+  void fire_this_completion() const override { on_completion(*this); }
   /* More callbacks */
   CommPtr set_copy_data_callback(const std::function<void(kernel::activity::CommImpl*, void*, size_t)>& callback);
-  static void copy_buffer_callback(kernel::activity::CommImpl*, void*, size_t);
-  static void copy_pointer_callback(kernel::activity::CommImpl*, void*, size_t);
+  XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_buffer_callback(
+      kernel::activity::CommImpl*, void*, size_t);
+  XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_pointer_callback(
+      kernel::activity::CommImpl*, void*, size_t);
 
   ~Comm() override;
 
@@ -130,7 +132,7 @@ public:
   CommPtr set_dst_data(void** buff, size_t size);
   /** Retrieve where the data will be copied on the receiver side */
   void* get_dst_data() const { return dst_buff_; }
-  /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining()  */
+  /** Retrieve the size of the received data. Not to be mixed with @ref Activity::get_remaining()  */
   size_t get_dst_data_size() const { return dst_buff_size_; }
 
   /* Common functions */
@@ -150,7 +152,6 @@ public:
   Actor* get_sender() const;
 
   /* Comm life cycle */
-  Comm* start() override;
   /** Start the comm, and ignore its result. It can be completely forgotten after that. */
   Comm* detach();
   /** Start the comm, and ignore its result. It can be completely forgotten after that. */
@@ -176,29 +177,6 @@ public:
   /*! Same as wait_all, but with a timeout. Return the number of terminated comm (less than comms.size() if the timeout
    * occurs). */
   static size_t wait_all_for(const std::vector<CommPtr>& comms, double timeout);
-
-#ifndef DOXYGEN
-  XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static int wait_any(
-      const std::vector<CommPtr>* comms)
-  {
-    return static_cast<int>(wait_any_for(*comms, -1));
-  }
-  XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for first parameter") static int wait_any_for(
-      const std::vector<CommPtr>* comms, double timeout)
-  {
-    return static_cast<int>(wait_any_for(*comms, timeout));
-  }
-  XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static void wait_all(
-      const std::vector<CommPtr>* comms)
-  {
-    wait_all(*comms);
-  }
-  XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static int test_any(
-      const std::vector<CommPtr>* comms)
-  {
-    return static_cast<int>(test_any(*comms));
-  }
-#endif
 };
 } // namespace s4u
 } // namespace simgrid