A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Enable warnings iff enable_compile_warnings=ON.
[simgrid.git]
/
src
/
mc
/
mc_request.c
diff --git
a/src/mc/mc_request.c
b/src/mc/mc_request.c
index
4f48449
..
a05c587
100644
(file)
--- 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;