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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_mailbox.cpp
diff --git
a/src/s4u/s4u_mailbox.cpp
b/src/s4u/s4u_mailbox.cpp
index
cd5b321
..
b53d652
100644
(file)
--- a/
src/s4u/s4u_mailbox.cpp
+++ b/
src/s4u/s4u_mailbox.cpp
@@
-73,7
+73,7
@@
CommPtr Mailbox::put_init()
res->mailbox_ = this;
return res;
}
res->mailbox_ = this;
return res;
}
-s4u::CommPtr Mailbox::put_init(void* data,
double
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
+81,28
@@
s4u::CommPtr Mailbox::put_init(void* data, double simulatedSize)
res->srcBuffSize_ = sizeof(void*);
return res;
}
res->srcBuffSize_ = sizeof(void*);
return res;
}
-s4u::CommPtr Mailbox::put_async(void*
data, double
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,
double
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,
double
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);