X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..b5edc55bfe0b09bcbeced8c1dc101cceec44d260:/src/mc/mc_request.c diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c index 4f484495b5..a05c58749d 100644 --- a/src/mc/mc_request.c +++ b/src/mc/mc_request.c @@ -10,6 +10,7 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) { if(_surf_do_model_check == 2) return TRUE; + if (r1->issuer == r2->issuer) return FALSE; @@ -145,6 +146,7 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) && r2->comm_wait.comm->comm.dst_buff != r1->comm_test.comm->comm.src_buff) return FALSE; + return TRUE; } @@ -203,7 +205,7 @@ char *MC_request_to_string(smx_req_t req, int value) break; case REQ_COMM_TEST: act = req->comm_test.comm; - if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){ + if(act->comm.src_proc == NULL || act->comm.dst_proc == NULL){ type = xbt_strdup("Test FALSE"); p = pointer_to_string(act); args = bprintf("comm=%s", p); @@ -211,10 +213,8 @@ char *MC_request_to_string(smx_req_t req, int value) type = xbt_strdup("Test TRUE"); p = pointer_to_string(act); args = bprintf("comm=%s [(%lu)%s -> (%lu)%s]", p, - act->comm.src_proc ? act->comm.src_proc->pid : 0, - act->comm.src_proc ? act->comm.src_proc->name : "", - act->comm.dst_proc ? act->comm.dst_proc->pid : 0, - act->comm.dst_proc ? act->comm.dst_proc->name : ""); + act->comm.src_proc->pid, act->comm.src_proc->name, + act->comm.dst_proc->pid, act->comm.dst_proc->name); } break;