Allow to chain calls to activity::Comm functions

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

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index c9016f9..1b36069 100644 (file)
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -42,22 +42,22 @@ public:
   /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */
   static int test_any(std::vector<CommPtr> * comms);
 
   /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */
   static int test_any(std::vector<CommPtr> * comms);
 

-  Activity* start() override;
-  Activity* wait() override;
-  Activity* wait_for(double timeout) override;
+  Comm* start() override;
+  Comm* wait() override;
+  Comm* wait_for(double timeout) override;

   bool test() override;
 
   /** Start the comm, and ignore its result. It can be completely forgotten after that. */
   bool test() override;
 
   /** Start the comm, and ignore its result. It can be completely forgotten after that. */

-  Activity* detach();
+  Comm* detach();

   /** Start the comm, and ignore its result. It can be completely forgotten after that. */
   /** Start the comm, and ignore its result. It can be completely forgotten after that. */

-  Activity* detach(void (*clean_function)(void*))
+  Comm* detach(void (*clean_function)(void*))

   {
     clean_fun_ = clean_function;
     return detach();
   }
 
   /** Sets the maximal communication rate (in byte/sec). Must be done before start */
   {
     clean_fun_ = clean_function;
     return detach();
   }
 
   /** Sets the maximal communication rate (in byte/sec). Must be done before start */

-  Activity* set_rate(double rate);
+  Comm* set_rate(double rate);

 
   /** Specify the data to send.
    *
 
   /** Specify the data to send.
    *


@@ -66,7 +66,7 @@ public:
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */

-  Activity* set_src_data(void* buff);
+  Comm* set_src_data(void* buff);

   /** Specify the size of the data to send. Not to be mixed with @ref Activity::set_remaining()
    *
    * That's the size of the data to actually copy in the simulator (ie, the data passed with Activity::set_src_data()).
   /** Specify the size of the data to send. Not to be mixed with @ref Activity::set_remaining()
    *
    * That's the size of the data to actually copy in the simulator (ie, the data passed with Activity::set_src_data()).


@@ -74,7 +74,7 @@ public:
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */

-  Activity* set_src_data_size(size_t size);
+  Comm* set_src_data_size(size_t size);

   /** Specify the data to send and its size. Don't mix the size with @ref Activity::set_remaining()
    *
    * This is way will get actually copied over to the receiver.
   /** Specify the data to send and its size. Don't mix the size with @ref Activity::set_remaining()
    *
    * This is way will get actually copied over to the receiver.


@@ -82,20 +82,20 @@ public:
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */
    * you can send a short buffer in your simulator, that represents a very large message
    * in the simulated world, or the opposite.
    */

-  Activity* set_src_data(void* buff, size_t size);
+  Comm* set_src_data(void* buff, size_t size);

 
   /** Specify where to receive the data.
    *
    * That's a buffer where the sent data will be copied */
 
   /** Specify where to receive the data.
    *
    * That's a buffer where the sent data will be copied */

-  Activity* set_dst_data(void** buff);
+  Comm* set_dst_data(void** buff);

   /** Specify the buffer in which the data should be received
    *
    * That's a buffer where the sent data will be copied  */
   /** Specify the buffer in which the data should be received
    *
    * That's a buffer where the sent data will be copied  */

-  Activity* set_dst_data(void** buff, size_t size);
+  Comm* set_dst_data(void** buff, size_t size);

   /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining()  */
   size_t get_dst_data_size();
 
   /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining()  */
   size_t get_dst_data_size();
 

-  Activity* cancel() override;
+  Comm* cancel() override;

 
   /** Retrieve the mailbox on which this comm acts */
   MailboxPtr get_mailbox();
 
   /** Retrieve the mailbox on which this comm acts */
   MailboxPtr get_mailbox();