test and fix Comm::set_payload_size + more chaining

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

diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index 5244567..f5fedf7 100644 (file)
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -91,13 +91,9 @@ CommPtr Mailbox::put_init()
   return res;
 }
 
-CommPtr Mailbox::put_init(void* data, uint64_t simulated_size_in_bytes)
+CommPtr Mailbox::put_init(void* payload, uint64_t simulated_size_in_bytes)
 {
-  CommPtr res = put_init();
-  res->set_remaining(simulated_size_in_bytes);
-  res->src_buff_      = data;
-  res->src_buff_size_ = sizeof(void*);
-  return res;
+  return put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->set_src_data_size(sizeof(void*));
 }
 
 CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes)
@@ -112,9 +108,7 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes)
 {
   xbt_assert(payload != nullptr, "You cannot send nullptr");
 
-  CommPtr c = put_init();
-  c->set_remaining(simulated_size_in_bytes);
-  c->set_src_data(payload);
+  CommPtr c = put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload);
   c->vetoable_start();
   c->wait();
 }
@@ -123,9 +117,7 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
 {
   xbt_assert(payload != nullptr, "You cannot send nullptr");
 
-  CommPtr c = put_init();
-  c->set_remaining(simulated_size_in_bytes);
-  c->set_src_data(payload);
+  CommPtr c = put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload);
   c->vetoable_start();
   c->wait_for(timeout);
 }