X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/931d9cd88230c4a7e46fade22192a77eadba0649..d68dcbd4cd142d73e90ab9376c34a435c10e1dc6:/src/s4u/s4u_comm.cpp

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 4ecb4e698d..9e068cca7b 100644
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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,181 +15,173 @@ 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
       XBT_INFO("pimpl_ is null");
     xbt_backtrace_display_current();
   }
-  if (pimpl_)
-    SIMIX_comm_unref(pimpl_);
 }
 
-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);
+  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_->get_impl(), 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_->get_impl(), 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);
-
-  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);
-
-  if (state_ == started) {
-    simcall_comm_wait(pimpl_, timeout);
-    state_ = finished;
-    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;
+/** @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 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_->get_impl(), remains_, rate_, srcBuff_, srcBuffSize_, matchFunction_,
+                          copyDataFunction_, user_data_, timeout);
+      } else { // Receiver
+        simcall_comm_recv(receiver_, mailbox_->get_impl(), 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;
+  }
+  return this;
 }
-s4u::CommPtr Comm::send_async(MailboxPtr dest, void* data, int simulatedSize)
+int Comm::test_any(std::vector<CommPtr>* 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_ == 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;
+  return start();
 }
 
-void Comm::cancel()
+Activity* Comm::cancel()
 {
-  simgrid::kernel::activity::CommImpl* commPimpl = static_cast<simgrid::kernel::activity::CommImpl*>(pimpl_);
+  simgrid::kernel::activity::CommImplPtr commPimpl =
+      boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(pimpl_);
   commPimpl->cancel();
+  return this;
 }
-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_ == inited) {
+
+bool Comm::test()
+{
+  xbt_assert(state_ == State::inited || state_ == State::started || state_ == State::finished);
+
+  if (state_ == State::finished)
+    return true;
+
+  if (state_ == State::inited)
     this->start();
-  }
-  
+
   if(simcall_comm_test(pimpl_)){
-    state_ = finished;
+    state_ = State::finished;
     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) {