A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict--
[simgrid.git]
/
src
/
s4u
/
s4u_mailbox.cpp
diff --git
a/src/s4u/s4u_mailbox.cpp
b/src/s4u/s4u_mailbox.cpp
index
1d28d1a
..
cb5b0a0
100644
(file)
--- a/
src/s4u/s4u_mailbox.cpp
+++ b/
src/s4u/s4u_mailbox.cpp
@@
-18,7
+18,7
@@
namespace s4u {
const char* Mailbox::getName()
{
const char* Mailbox::getName()
{
- return pimpl_->name_;
+ return pimpl_->name_
.c_str()
;
}
MailboxPtr Mailbox::byName(const char*name)
}
MailboxPtr Mailbox::byName(const char*name)
@@
-53,9
+53,7
@@
smx_activity_t Mailbox::front()
}
void Mailbox::setReceiver(ActorPtr actor) {
}
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) */
}
/** @brief get the receiver (process associated to the mailbox) */
@@
-73,7
+71,7
@@
CommPtr Mailbox::put_init()
res->mailbox_ = this;
return res;
}
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);
{
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;
}
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;
}
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 */
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);
CommPtr c = put_init();
c->setRemains(simulatedSize);
c->setSrcData(payload);