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 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
8156900
..
bcf0309
100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-114,7
+114,7
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
c->set_remaining(simulated_size_in_bytes);
c->set_src_data(payload);
// c->start() is optional.
c->set_remaining(simulated_size_in_bytes);
c->set_src_data(payload);
// c->start() is optional.
- c->wait(timeout);
+ c->wait
_for
(timeout);
}
s4u::CommPtr Mailbox::get_init()
}
s4u::CommPtr Mailbox::get_init()
@@
-145,7
+145,7
@@
void* Mailbox::get(double timeout)
void* res = nullptr;
CommPtr c = get_init();
c->set_dst_data(&res, sizeof(res));
void* res = nullptr;
CommPtr c = get_init();
c->set_dst_data(&res, sizeof(res));
- c->wait(timeout);
+ c->wait
_for
(timeout);
return res;
}
} // namespace s4u
return res;
}
} // namespace s4u