X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/423d3ad610d6a1e0587b42fd7d2a7a9959af778d..4a13db94f50023e3e9ad850b936b69b5f85b7fb7:/src/s4u/s4u_comm.cpp diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp index 95a5a8712d..549b1bf271 100644 --- a/src/s4u/s4u_comm.cpp +++ b/src/s4u/s4u_comm.cpp @@ -3,8 +3,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "src/msg/msg_private.hpp" #include "xbt/log.h" -#include "src/msg/msg_private.h" #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" @@ -15,8 +15,8 @@ namespace simgrid { namespace s4u { Comm::~Comm() { - if (state_ == started && not detached_ && (pimpl_ == nullptr || pimpl_->state == SIMIX_RUNNING)) { - XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, state_); + if (state_ == State::started && not detached_ && (pimpl_ == nullptr || pimpl_->state == SIMIX_RUNNING)) { + XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, (int)state_); if (pimpl_ != nullptr) XBT_INFO("pimpl_->state: %d", pimpl_->state); else @@ -25,147 +25,159 @@ Comm::~Comm() } } -void Comm::setRate(double rate) { - xbt_assert(state_==inited); +Activity* Comm::setRate(double rate) +{ + xbt_assert(state_ == State::inited); rate_ = rate; + return this; } -void Comm::setSrcData(void * buff) { - xbt_assert(state_==inited); +Activity* Comm::setSrcData(void* buff) +{ + xbt_assert(state_ == State::inited); xbt_assert(dstBuff_ == nullptr, "Cannot set the src and dst buffers at the same time"); srcBuff_ = buff; + return this; } -void Comm::setSrcDataSize(size_t size){ - xbt_assert(state_==inited); +Activity* Comm::setSrcDataSize(size_t size) +{ + xbt_assert(state_ == State::inited); srcBuffSize_ = size; + return this; } -void Comm::setSrcData(void * buff, size_t size) { - xbt_assert(state_==inited); +Activity* Comm::setSrcData(void* buff, size_t size) +{ + xbt_assert(state_ == State::inited); xbt_assert(dstBuff_ == nullptr, "Cannot set the src and dst buffers at the same time"); srcBuff_ = buff; srcBuffSize_ = size; + return this; } -void Comm::setDstData(void ** buff) { - xbt_assert(state_==inited); +Activity* Comm::setDstData(void** buff) +{ + xbt_assert(state_ == State::inited); xbt_assert(srcBuff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dstBuff_ = buff; + return this; } size_t Comm::getDstDataSize(){ - xbt_assert(state_==finished); + xbt_assert(state_ == State::finished); return dstBuffSize_; } -void Comm::setDstData(void ** buff, size_t size) { - xbt_assert(state_==inited); +Activity* Comm::setDstData(void** buff, size_t size) +{ + xbt_assert(state_ == State::inited); xbt_assert(srcBuff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dstBuff_ = buff; dstBuffSize_ = size; + return this; } -void Comm::start() { - xbt_assert(state_ == inited); +Activity* Comm::start() +{ + xbt_assert(state_ == State::inited); if (srcBuff_ != nullptr) { // Sender side - pimpl_ = simcall_comm_isend(sender_, mailbox_->getImpl(), remains_, rate_, - srcBuff_, srcBuffSize_, - matchFunction_, cleanFunction_, copyDataFunction_, - userData_, detached_); + pimpl_ = simcall_comm_isend(sender_, mailbox_->getImpl(), remains_, rate_, srcBuff_, srcBuffSize_, matchFunction_, + cleanFunction_, copyDataFunction_, user_data_, detached_); } else if (dstBuff_ != nullptr) { // Receiver side xbt_assert(not detached_, "Receive cannot be detached"); - pimpl_ = simcall_comm_irecv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, - matchFunction_, copyDataFunction_, - userData_, rate_); + pimpl_ = simcall_comm_irecv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, matchFunction_, + copyDataFunction_, user_data_, rate_); } else { xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver"); } - state_ = started; -} -void Comm::wait() { - xbt_assert(state_ == started || state_ == inited || state_ == finished); - - if (state_ == finished) - return; - - if (state_ == started) - simcall_comm_wait(pimpl_, -1/*timeout*/); - else { // state_ == inited. Save a simcall and do directly a blocking send/recv - if (srcBuff_ != nullptr) { - simcall_comm_send(sender_, mailbox_->getImpl(), remains_, rate_, - srcBuff_, srcBuffSize_, - matchFunction_, copyDataFunction_, - userData_, -1 /*timeout*/); - } else { - simcall_comm_recv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, - matchFunction_, copyDataFunction_, - userData_, -1/*timeout*/, rate_); - } - } - state_ = finished; + state_ = State::started; + return this; } -void Comm::wait(double timeout) { - xbt_assert(state_ == started || state_ == inited || state_ == finished); - - if (state_ == finished) - return; +/** @brief Block the calling actor until the communication is finished */ +Activity* Comm::wait() +{ + return this->wait(-1); +} - if (state_ == started) { - simcall_comm_wait(pimpl_, timeout); - state_ = finished; - return; +/** @brief Block the calling actor until the communication is finished, or until timeout + * + * On timeout, an exception is thrown. + * + * @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) +{ + switch (state_) { + case State::finished: + return this; + + case State::inited: // It's not started yet. Do it in one simcall + if (srcBuff_ != nullptr) { + simcall_comm_send(sender_, mailbox_->getImpl(), remains_, rate_, srcBuff_, srcBuffSize_, matchFunction_, + copyDataFunction_, user_data_, timeout); + } else { // Receiver + simcall_comm_recv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, matchFunction_, copyDataFunction_, + user_data_, timeout, rate_); + } + state_ = State::finished; + return this; + + case State::started: + simcall_comm_wait(pimpl_, timeout); + state_ = State::finished; + return this; + + default: + THROW_IMPOSSIBLE; } - - // It's not started yet. Do it in one simcall - if (srcBuff_ != nullptr) { - simcall_comm_send(sender_, mailbox_->getImpl(), remains_, rate_, - srcBuff_, srcBuffSize_, - matchFunction_, copyDataFunction_, - userData_, timeout); - } else { // Receiver - simcall_comm_recv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, - matchFunction_, copyDataFunction_, - userData_, timeout, rate_); + return this; +} +int Comm::test_any(std::vector* comms) +{ + smx_activity_t* array = new smx_activity_t[comms->size()]; + for (unsigned int i = 0; i < comms->size(); i++) { + array[i] = comms->at(i)->pimpl_; } - state_ = finished; + int res = simcall_comm_testany(array, comms->size()); + delete[] array; + return res; } -void Comm::detach() +Activity* Comm::detach() { - xbt_assert(state_ == inited, "You cannot detach communications once they are started."); + xbt_assert(state_ == State::inited, "You cannot detach communications once they are started (not implemented)."); xbt_assert(srcBuff_ != nullptr && srcBuffSize_ != 0, "You can only detach sends, not recvs"); detached_ = true; - start(); + return start(); } -void Comm::cancel() +Activity* Comm::cancel() { simgrid::kernel::activity::CommImplPtr commPimpl = boost::static_pointer_cast(pimpl_); commPimpl->cancel(); + return this; } bool Comm::test() { - xbt_assert(state_ == inited || state_ == started || state_ == finished); + xbt_assert(state_ == State::inited || state_ == State::started || state_ == State::finished); - if (state_ == finished) { + if (state_ == State::finished) return true; - } - if (state_ == inited) { + if (state_ == State::inited) this->start(); - } if(simcall_comm_test(pimpl_)){ - state_ = finished; + state_ = State::finished; return true; } return false; } -MailboxPtr Comm::mailbox() +MailboxPtr Comm::getMailbox() { return mailbox_; }