From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 30 Jan 2014 21:27:22 +0000 (+0100)
Subject: Reintroduce MC stuff lost by commit 11af893.
X-Git-Tag: v3_11_beta~100
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2328d6d0b71ed92be2530507d88bad4186f602d6

Reintroduce MC stuff lost by commit 11af893.
---

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 54acb6f247..8ec29c1ef1 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1019,9 +1019,11 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
 
   if (MC_is_active()) {
     /* the model-checker wants two separate simcalls */
-    smx_action_t comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
-                                           match_fun, data, rate);
+    smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+    comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
+                              match_fun, data, rate);
     simcall_comm_wait(comm, timeout);
+    comm = NULL;
   }
   else {
     simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,