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_Comm.cpp
diff --git
a/src/s4u/s4u_Comm.cpp
b/src/s4u/s4u_Comm.cpp
index
bebc91b
..
658097e
100644
(file)
--- a/
src/s4u/s4u_Comm.cpp
+++ b/
src/s4u/s4u_Comm.cpp
@@
-53,55
+53,60
@@
void Comm::wait_all(std::vector<CommPtr>* comms)
{
// TODO: this should be a simcall or something
// TODO: we are missing a version with timeout
- for (CommPtr comm : *comms)
{
+ for (CommPtr comm : *comms)
comm->wait();
- }
}
-
Activity
* Comm::set_rate(double rate)
+
Comm
* Comm::set_rate(double rate)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
rate_ = rate;
return this;
}
-
Activity
* Comm::set_src_data(void* buff)
+
Comm
* Comm::set_src_data(void* buff)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
src_buff_ = buff;
return this;
}
-
Activity
* Comm::set_src_data_size(size_t size)
+
Comm
* Comm::set_src_data_size(size_t size)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
src_buff_size_ = size;
return this;
}
-
Activity
* Comm::set_src_data(void* buff, size_t size)
+
Comm
* Comm::set_src_data(void* buff, size_t size)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
src_buff_ = buff;
src_buff_size_ = size;
return this;
}
-
Activity
* Comm::set_dst_data(void** buff)
+
Comm
* Comm::set_dst_data(void** buff)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
dst_buff_ = buff;
return this;
}
size_t Comm::get_dst_data_size()
{
- xbt_assert(state_ == State::FINISHED);
+ xbt_assert(state_ == State::FINISHED
, "You cannot use %s before your communication terminated", __FUNCTION__
);
return dst_buff_size_;
}
-
Activity
* Comm::set_dst_data(void** buff, size_t size)
+
Comm
* Comm::set_dst_data(void** buff, size_t size)
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
dst_buff_ = buff;
@@
-109,9
+114,10
@@
Activity* Comm::set_dst_data(void** buff, size_t size)
return this;
}
-
Activity
* Comm::start()
+
Comm
* Comm::start()
{
- xbt_assert(state_ == State::INITED);
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
if (src_buff_ != nullptr) { // Sender side
on_sender_start(Actor::self());
@@
-131,9
+137,9
@@
Activity* Comm::start()
}
/** @brief Block the calling actor until the communication is finished */
-
Activity
* Comm::wait()
+
Comm
* Comm::wait()
{
- return this->wait(-1);
+ return this->wait
_for
(-1);
}
/** @brief Block the calling actor until the communication is finished, or until timeout
@@
-142,7
+148,7
@@
Activity* Comm::wait()
*
* @param timeout the amount of seconds to wait for the comm termination.
* Negative values denote infinite wait times. 0 as a timeout returns immediately. */
-
Activity* Comm::wait
(double timeout)
+
Comm* Comm::wait_for
(double timeout)
{
switch (state_) {
case State::FINISHED:
@@
-184,15
+190,16
@@
int Comm::test_any(std::vector<CommPtr>* comms)
return res;
}
-
Activity
* Comm::detach()
+
Comm
* Comm::detach()
{
- xbt_assert(state_ == State::INITED, "You cannot detach communications once they are started (not implemented).");
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
+ __FUNCTION__);
xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
detached_ = true;
return start();
}
-
Activity
* Comm::cancel()
+
Comm
* Comm::cancel()
{
simgrid::simix::simcall([this] { dynamic_cast<kernel::activity::CommImpl*>(pimpl_.get())->cancel(); });
state_ = State::CANCELED;