From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 8 Nov 2012 16:19:53 +0000 (+0100)
Subject: model-checker : enable WaitTimeout requests only if cfg flag model-check/timeout:1
X-Git-Tag: v3_9_rc1~91^2~126^2~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a183bb2523e9b08d1c10114d109bd1b57dd15471

model-checker : enable WaitTimeout requests only if cfg flag model-check/timeout:1
---

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index 50c7cd226a..cdd8c33679 100644
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -300,7 +300,12 @@ int MC_request_is_enabled(smx_simcall_t req)
      * communication is not ready, it can timeout and won't block.
      * On the other hand if it hasn't a timeout, check if the comm is ready.*/
     if(req->comm_wait.timeout >= 0){
-      return TRUE;
+      if(_surf_mc_timeout == 1){
+        return TRUE;
+      }else{
+        act = req->comm_wait.comm;
+        return (act->comm.src_proc && act->comm.dst_proc);
+      }
     }else{
       act = req->comm_wait.comm;
       return (act->comm.src_proc && act->comm.dst_proc);