Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 4fd7d4e122944cc9c41e0da46196e2524298d1df..3d6be869d4906e320a9234d7877381a8a275b6ef 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");
 
@@ -108,6 +110,7 @@ void Comm::wait() {
     }
   }
   state_ = finished;
+  delete this;
 }
 void Comm::wait(double timeout) {
   xbt_assert(state_ == started || state_ == inited);
@@ -130,6 +133,7 @@ void Comm::wait(double timeout) {
         userData_, timeout, rate_);
   }
   state_ = finished;
+  delete this;
 }
 
 s4u::Comm &Comm::send_async(MailboxPtr dest, void *data, int simulatedSize) {
@@ -160,6 +164,7 @@ bool Comm::test() {
   
   if(simcall_comm_test(pimpl_)){
     state_ = finished;
+    delete this;
     return true;
   }
   return false;