Move collective algorithms to separate folders

[simgrid.git] / src / s4u / s4u_comm.cpp

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 7873e1d..3d6be86 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -8,6 +8,8 @@
 #include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/comm.hpp"
+#include <simgrid/s4u/Mailbox.hpp>
+
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm,s4u_activity,"S4U asynchronous communications");
 
@@ -20,17 +22,17 @@ Comm::~Comm() {
 
 
 
-s4u::Comm &Comm::send_init(s4u::Mailbox &chan) {
+s4u::Comm &Comm::send_init(s4u::MailboxPtr chan) {
   s4u::Comm *res = new s4u::Comm();
   res->sender_ = SIMIX_process_self();
-  res->mailbox_ = &chan;
+  res->mailbox_ = chan;
   return *res;
 }
 
-s4u::Comm &Comm::recv_init(s4u::Mailbox &chan) {
+s4u::Comm &Comm::recv_init(s4u::MailboxPtr chan) {
   s4u::Comm *res = new s4u::Comm();
   res->receiver_ = SIMIX_process_self();
-  res->mailbox_ = &chan;
+  res->mailbox_ = chan;
   return *res;
 }
 
@@ -108,6 +110,7 @@ void Comm::wait() {
     }
   }
   state_ = finished;
+  delete this;
 }
 void Comm::wait(double timeout) {
   xbt_assert(state_ == started || state_ == inited);
@@ -130,9 +133,10 @@ void Comm::wait(double timeout) {
         userData_, timeout, rate_);
   }
   state_ = finished;
+  delete this;
 }
 
-s4u::Comm &Comm::send_async(Mailbox &dest, void *data, int simulatedSize) {
+s4u::Comm &Comm::send_async(MailboxPtr dest, void *data, int simulatedSize) {
   s4u::Comm &res = s4u::Comm::send_init(dest);
   res.setRemains(simulatedSize);
   res.srcBuff_ = data;
@@ -141,7 +145,7 @@ s4u::Comm &Comm::send_async(Mailbox &dest, void *data, int simulatedSize) {
   return res;
 }
 
-s4u::Comm &Comm::recv_async(Mailbox &dest, void **data) {
+s4u::Comm &Comm::recv_async(MailboxPtr dest, void **data) {
   s4u::Comm &res = s4u::Comm::recv_init(dest);
   res.setDstData(data);
   res.start();
@@ -160,6 +164,7 @@ bool Comm::test() {
   
   if(simcall_comm_test(pimpl_)){
     state_ = finished;
+    delete this;
     return true;
   }
   return false;