Merge remote-tracking branch 'adfaure/master'

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index 47c7332..2929750 100644 (file)
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -56,6 +56,8 @@ public:
   /** Retrieve the size of the received data */
   size_t getDstDataSize();
 
+  bool test();
+
 
 private:
   double rate_ = -1;

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 5910405..401a6c2 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -146,5 +146,22 @@ s4u::Comm &Comm::recv_async(Mailbox &dest, void **data) {
   return res;
 }
 
+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) {
+    this->start();
+  }
+  
+  if(simcall_comm_test(pimpl_)){
+    state_ = finished;
+    return true;
+  }
+  return false;
+}
+
 }
 }