X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d68a0ac239494f0a1c7f21b7c195f453ee7a31eb..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/s4u/s4u_comm.cpp diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp index 8340bd320b..f2ab1fd795 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" @@ -23,170 +23,150 @@ Comm::~Comm() XBT_INFO("pimpl_ is null"); xbt_backtrace_display_current(); } - if (pimpl_) - pimpl_->unref(); } -s4u::CommPtr Comm::send_init(s4u::MailboxPtr chan) +Activity* Comm::setRate(double rate) { - CommPtr res = CommPtr(new s4u::Comm()); - res->sender_ = SIMIX_process_self(); - res->mailbox_ = chan; - return res; -} - -s4u::CommPtr Comm::recv_init(s4u::MailboxPtr chan) -{ - CommPtr res = CommPtr(new s4u::Comm()); - res->receiver_ = SIMIX_process_self(); - res->mailbox_ = chan; - return res; -} - -void Comm::setRate(double rate) { xbt_assert(state_==inited); rate_ = rate; + return this; } -void Comm::setSrcData(void * buff) { +Activity* Comm::setSrcData(void* buff) +{ xbt_assert(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){ +Activity* Comm::setSrcDataSize(size_t size) +{ xbt_assert(state_==inited); srcBuffSize_ = size; + return this; } -void Comm::setSrcData(void * buff, size_t size) { +Activity* Comm::setSrcData(void* buff, size_t size) +{ xbt_assert(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) { +Activity* Comm::setDstData(void** buff) +{ xbt_assert(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); return dstBuffSize_; } -void Comm::setDstData(void ** buff, size_t size) { +Activity* Comm::setDstData(void** buff, size_t size) +{ xbt_assert(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() { +Activity* Comm::start() +{ xbt_assert(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 - pimpl_ = simcall_comm_irecv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, - matchFunction_, copyDataFunction_, - userData_, rate_); + xbt_assert(not detached_, "Receive cannot be detached"); + 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; + return this; } -void Comm::wait() { - xbt_assert(state_ == started || state_ == inited); - - 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; - if (pimpl_) - pimpl_->unref(); -} - -void Comm::wait(double timeout) { - xbt_assert(state_ == started || state_ == inited); - if (state_ == started) { - simcall_comm_wait(pimpl_, timeout); - state_ = finished; - pimpl_->unref(); - return; - } - - // 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_); - } - state_ = finished; - if (pimpl_) - pimpl_->unref(); +/** @brief Block the calling actor until the communication is finished */ +Activity* Comm::wait() +{ + return this->wait(-1); } -void Comm::send_detached(MailboxPtr dest, void* data, int simulatedSize) +/** @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) { - s4u::CommPtr res = CommPtr(s4u::Comm::send_init(dest)); - res->setRemains(simulatedSize); - res->srcBuff_ = data; - res->srcBuffSize_ = sizeof(void*); - res->detached_ = true; - res->start(); + switch (state_) { + case finished: + return this; + + case 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_ = finished; + return this; + + case started: + simcall_comm_wait(pimpl_, timeout); + state_ = finished; + return this; + + default: + THROW_IMPOSSIBLE; + } + return this; } - -s4u::CommPtr Comm::send_async(MailboxPtr dest, void* data, int simulatedSize) +int Comm::test_any(std::vector* comms) { - s4u::CommPtr res = CommPtr(s4u::Comm::send_init(dest)); - res->setRemains(simulatedSize); - res->srcBuff_ = data; - res->srcBuffSize_ = sizeof(void*); - res->start(); + 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_; + } + int res = simcall_comm_testany(array, comms->size()); + delete[] array; return res; } -s4u::CommPtr Comm::recv_async(MailboxPtr dest, void** data) +Activity* Comm::detach() { - s4u::CommPtr res = CommPtr(s4u::Comm::recv_init(dest)); - res->setDstData(data, sizeof(*data)); - res->start(); - return res; + xbt_assert(state_ == inited, "You cannot detach communications once they are started."); + xbt_assert(srcBuff_ != nullptr && srcBuffSize_ != 0, "You can only detach sends, not recvs"); + detached_ = true; + 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() { +bool Comm::test() +{ xbt_assert(state_ == inited || state_ == started || state_ == finished); - if (state_ == finished) - xbt_die("Don't call test on a finished comm."); + if (state_ == finished) { + return true; + } if (state_ == inited) { this->start(); @@ -194,12 +174,16 @@ bool Comm::test() { if(simcall_comm_test(pimpl_)){ state_ = finished; - pimpl_->unref(); return true; } return false; } +MailboxPtr Comm::getMailbox() +{ + return mailbox_; +} + void intrusive_ptr_release(simgrid::s4u::Comm* c) { if (c->refcount_.fetch_sub(1, std::memory_order_release) == 1) {