From ddb1211b268612dc55dea470f9d88bc4eba7c4ee Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 3 Jul 2017 17:58:45 +0200
Subject: [PATCH 1/1] please henri, add recv with timeout.

---
 include/simgrid/s4u/Actor.hpp | 1 +
 src/s4u/s4u_actor.cpp         | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 5b0378c21d..524f508b66 100644
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -313,6 +313,7 @@ template <class Rep, class Period> inline void sleep_for(std::chrono::duration<R
    * See \ref Comm for the full communication API (including non blocking communications).
    */
   XBT_PUBLIC(void*) recv(MailboxPtr chan);
+  XBT_PUBLIC(void*) recv(MailboxPtr chan, double timeout);
   XBT_PUBLIC(CommPtr) irecv(MailboxPtr chan, void** data);
 
   /** Block the actor until it delivers a message of the given simulated size to the given mailbox
diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index ab6f3a1d3f..eb588cabd2 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -211,6 +211,15 @@ void* recv(MailboxPtr chan) {
   return res;
 }
 
+void* recv(MailboxPtr chan, double timeout)
+{
+  void* res = nullptr;
+  CommPtr c = Comm::recv_init(chan);
+  c->setDstData(&res, sizeof(res));
+  c->wait(timeout);
+  return res;
+}
+
 void send(MailboxPtr chan, void* payload, double simulatedSize)
 {
   CommPtr c = Comm::send_init(chan);
-- 
2.20.1