test and fix Comm::set_payload_size + more chaining

[simgrid.git] / src / s4u / s4u_Comm.cpp

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index a0ee15f..3c216b4 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -118,9 +118,9 @@ CommPtr Comm::set_dst_data(void** buff, size_t size)
   dst_buff_size_ = size;
   return this;
 }
-Comm* Comm::set_payload_size(double bytes)
+CommPtr Comm::set_payload_size(double bytes)
 {
-  set_remaining(bytes);
+  Activity::set_remaining(bytes);
   return this;
 }
 
@@ -132,10 +132,11 @@ CommPtr Comm::sendto_init(Host* from, Host* to)
 
   return res;
 }
+
 CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes)
 {
-  auto res = Comm::sendto_init(from, to);
-  res->set_remaining(simulated_size_in_bytes)->start();
+  auto res = Comm::sendto_init(from, to)->set_payload_size(simulated_size_in_bytes);
+  res->vetoable_start();
   return res;
 }