- 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 (_sg_mc_timeout == 1)
- return true;
- }
- /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- else if (act->detached && act->src_proc == nullptr
- && act->type == SIMIX_COMM_READY)
+ // Now, we are in the client app, no need for remote memory reading.
+ smx_simcall_t req = &actor->simcall;
+
+ switch (req->call) {
+ case SIMCALL_NONE:
+ return false;
+
+ case SIMCALL_COMM_WAIT: {
+ /* FIXME: check also that src and dst processes are not suspended */
+ simgrid::kernel::activity::CommImpl* act =
+ static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
+
+ 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;
+ }
+ /* On the other hand if it hasn't a timeout, check if the comm is ready.*/
+ else if (act->detached && act->src_proc == nullptr && act->type == SIMIX_COMM_READY)