X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca9c986801463f350a0564a786d3334eb3a2c45a..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/s4u/s4u_mailbox.cpp diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp index 1d28d1a6b3..245bd5334b 100644 --- a/src/s4u/s4u_mailbox.cpp +++ b/src/s4u/s4u_mailbox.cpp @@ -53,9 +53,7 @@ smx_activity_t Mailbox::front() } void Mailbox::setReceiver(ActorPtr actor) { - simix::kernelImmediate([this, actor]() { - this->pimpl_->setReceiver(actor); - }); + simix::kernelImmediate([this, actor]() { this->pimpl_->setReceiver(actor); }); } /** @brief get the receiver (process associated to the mailbox) */ @@ -73,7 +71,7 @@ CommPtr Mailbox::put_init() res->mailbox_ = this; return res; } -s4u::CommPtr Mailbox::put_init(void* data, size_t simulatedSize) +s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize) { s4u::CommPtr res = put_init(); res->setRemains(simulatedSize); @@ -81,22 +79,28 @@ s4u::CommPtr Mailbox::put_init(void* data, size_t simulatedSize) res->srcBuffSize_ = sizeof(void*); return res; } -s4u::CommPtr Mailbox::put_async(void* data, size_t simulatedSize) +s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize) { - s4u::CommPtr res = put_init(data, simulatedSize); + xbt_assert(payload != nullptr, "You cannot send nullptr"); + + s4u::CommPtr res = put_init(payload, simulatedSize); res->start(); return res; } -void Mailbox::put(void* payload, size_t simulatedSize) +void Mailbox::put(void* payload, uint64_t simulatedSize) { + xbt_assert(payload != nullptr, "You cannot send nullptr"); + CommPtr c = put_init(); c->setRemains(simulatedSize); c->setSrcData(payload); c->wait(); } /** Blocking send with timeout */ -void Mailbox::put(void* payload, size_t simulatedSize, double timeout) +void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout) { + xbt_assert(payload != nullptr, "You cannot send nullptr"); + CommPtr c = put_init(); c->setRemains(simulatedSize); c->setSrcData(payload);