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
Improve independence detection and request pretty printing.
[simgrid.git]
/
src
/
mc
/
mc_state.c
diff --git
a/src/mc/mc_state.c
b/src/mc/mc_state.c
index
9a5db9f
..
46f6d6c
100644
(file)
--- a/
src/mc/mc_state.c
+++ b/
src/mc/mc_state.c
@@
-51,6
+51,9
@@
int MC_state_process_is_done(mc_state_t state, smx_process_t process){
void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value)
{
void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value)
{
+ state->executed_req = *req;
+ state->req_num = value;
+
/* The waitany and testany request are transformed into a wait or test request over the
* corresponding communication action so it can be treated later by the dependence
* function. */
/* The waitany and testany request are transformed into a wait or test request over the
* corresponding communication action so it can be treated later by the dependence
* function. */
@@
-76,13
+79,15
@@
void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value)
case REQ_COMM_WAIT:
state->internal_req = *req;
case REQ_COMM_WAIT:
state->internal_req = *req;
- state->internal_comm = *req->comm_wait.comm;
+ state->internal_comm = *(req->comm_wait.comm);
+ state->executed_req.comm_wait.comm = &state->internal_comm;
state->internal_req.comm_wait.comm = &state->internal_comm;
break;
case REQ_COMM_TEST:
state->internal_req = *req;
state->internal_comm = *req->comm_test.comm;
state->internal_req.comm_wait.comm = &state->internal_comm;
break;
case REQ_COMM_TEST:
state->internal_req = *req;
state->internal_comm = *req->comm_test.comm;
+ state->executed_req.comm_test.comm = &state->internal_comm;
state->internal_req.comm_test.comm = &state->internal_comm;
break;
state->internal_req.comm_test.comm = &state->internal_comm;
break;
@@
-90,9
+95,6
@@
void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value)
state->internal_req = *req;
break;
}
state->internal_req = *req;
break;
}
-
- state->executed_req = *req;
- state->req_num = value;
}
smx_req_t MC_state_get_executed_request(mc_state_t state, int *value)
}
smx_req_t MC_state_get_executed_request(mc_state_t state, int *value)
@@
-157,6
+159,18
@@
smx_req_t MC_state_get_request(mc_state_t state, int *value)
break;
break;
+ case REQ_COMM_WAIT:
+ if(process->request.comm_wait.comm->comm.src_proc
+ && process->request.comm_wait.comm->comm.dst_proc){
+ *value = 0;
+ }else{
+ *value = -1;
+ }
+ procstate->state = MC_DONE;
+ return &process->request;
+
+ break;
+
default:
procstate->state = MC_DONE;
*value = 0;
default:
procstate->state = MC_DONE;
*value = 0;