From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 27 Jun 2017 20:44:07 +0000 (+0200)
Subject: MC: compute if a COMM_WAIT is enabled with the activity only, w/o the request
X-Git-Tag: v3_17~509
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ec2803b05af824ebf6208565e17ab04c915db575?hp=3eaab01ff3aaf3b8addf247073237c5891f485d4

MC: compute if a COMM_WAIT is enabled with the activity only, w/o the request
---

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 6f13189458..f367c99118 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -91,9 +91,9 @@ bool request_is_enabled(smx_simcall_t req)
     }
 #endif
 
-    if (simcall_comm_wait__get__timeout(req) >= 0) {
-      /* If it has a timeout it will be always be enabled, because even if the
-       * communication is not ready, it can timeout and won't block. */
+    if (act->src_timeout || act->dst_timeout) {
+      /* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
+       * because even if the communication is not ready, it can timeout and won't block. */
       if (_sg_mc_timeout == 1)
         return true;
     }