From ec2803b05af824ebf6208565e17ab04c915db575 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 27 Jun 2017 22:44:07 +0200 Subject: [PATCH] MC: compute if a COMM_WAIT is enabled with the activity only, w/o the request --- src/mc/mc_base.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; } -- 2.20.1