model-checker : fix MC_state_set_executed_request

Comm for SIMCALL_COMM_WAIT was internal_comm address of mc_state
(confusion between s_smx_action_t and smx_action_t)

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 7faf1f1..c1808d1 100644 (file)
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -86,7 +86,7 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
       state->internal_req.call = SIMCALL_COMM_WAIT;
       state->internal_req.issuer = req->issuer;
       state->internal_comm = *xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t);
       state->internal_req.call = SIMCALL_COMM_WAIT;
       state->internal_req.issuer = req->issuer;
       state->internal_comm = *xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t);

-      simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+      simcall_comm_wait__set__comm(&state->internal_req, xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, smx_action_t));

       simcall_comm_wait__set__timeout(&state->internal_req, 0);
       break;
 
       simcall_comm_wait__set__timeout(&state->internal_req, 0);
       break;
 


@@ -97,22 +97,22 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
       if(value > 0)
         state->internal_comm = *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, smx_action_t);
 
       if(value > 0)
         state->internal_comm = *xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, smx_action_t);
 

-      simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+      simcall_comm_test__set__comm(&state->internal_req, xbt_dynar_get_as(simcall_comm_testany__get__comms(req), value, smx_action_t));

       simcall_comm_test__set__result(&state->internal_req, value);
       break;
 
     case SIMCALL_COMM_WAIT:
       state->internal_req = *req;
       state->internal_comm = *(simcall_comm_wait__get__comm(req));
       simcall_comm_test__set__result(&state->internal_req, value);
       break;
 
     case SIMCALL_COMM_WAIT:
       state->internal_req = *req;
       state->internal_comm = *(simcall_comm_wait__get__comm(req));

-      simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm);
-      simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
+      simcall_comm_wait__set__comm(&state->executed_req, simcall_comm_wait__get__comm(req));
+      simcall_comm_wait__set__comm(&state->internal_req, simcall_comm_wait__get__comm(req));

       break;
 
     case SIMCALL_COMM_TEST:
       state->internal_req = *req;
       state->internal_comm = *simcall_comm_test__get__comm(req);
       break;
 
     case SIMCALL_COMM_TEST:
       state->internal_req = *req;
       state->internal_comm = *simcall_comm_test__get__comm(req);

-      simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm);
-      simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+      simcall_comm_test__set__comm(&state->executed_req, simcall_comm_test__get__comm(req));
+      simcall_comm_test__set__comm(&state->internal_req, simcall_comm_test__get__comm(req));

       break;
 
     default:
       break;
 
     default: