/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <assert.h>
+
#include "mc_request.h"
#include "mc_safety.h"
#include "mc_private.h"
static char *pointer_to_string(void *pointer);
static char *buff_size_to_string(size_t size);
+// Those are MC_state_get_internal_request(state)
int MC_request_depend(smx_simcall_t r1, smx_simcall_t r2)
{
if (mc_reduce_kind == e_mc_reduce_none)
if (r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_ISEND)
return FALSE;
- // Read object from MCed memory:
- s_smx_synchro_t synchro1, synchro2;
+ // Those are internal requests, we do not need indirection
+ // because those objects are copies:
+ smx_synchro_t synchro1, synchro2;
if (r1->call == SIMCALL_COMM_WAIT) {
- MC_process_read_simple(&mc_model_checker->process, &synchro1,
- simcall_comm_wait__get__comm(r1), sizeof(synchro1));
+ synchro1 = simcall_comm_wait__get__comm(r1);
}
if (r2->call == SIMCALL_COMM_WAIT) {
- MC_process_read_simple(&mc_model_checker->process, &synchro2,
- simcall_comm_wait__get__comm(r2), sizeof(synchro2));
+ synchro2 = simcall_comm_wait__get__comm(r2);
}
if (r1->call == SIMCALL_COMM_TEST) {
- MC_process_read_simple(&mc_model_checker->process, &synchro1,
- simcall_comm_test__get__comm(r1), sizeof(synchro1));
+ synchro1 = simcall_comm_test__get__comm(r1);
}
if (r2->call == SIMCALL_COMM_TEST) {
- MC_process_read_simple(&mc_model_checker->process, &synchro2,
- simcall_comm_test__get__comm(r2), sizeof(synchro2));
+ synchro2 = simcall_comm_test__get__comm(r2);
}
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r1) :
simcall_comm_irecv__get__rdv(r1);
- if (rdv != synchro2.comm.rdv_cpy
+ if (rdv != synchro2->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r2) <= 0)
return FALSE;
- if ((r1->issuer != synchro2.comm.src_proc)
- && (r1->issuer != synchro2.comm.dst_proc)
+ if ((r1->issuer != synchro2->comm.src_proc)
+ && (r1->issuer != synchro2->comm.dst_proc)
&& simcall_comm_wait__get__timeout(r2) <= 0)
return FALSE;
if ((r1->call == SIMCALL_COMM_ISEND)
- && (synchro2.comm.type == SIMIX_COMM_SEND)
- && (synchro2.comm.src_buff !=
+ && (synchro2->comm.type == SIMIX_COMM_SEND)
+ && (synchro2->comm.src_buff !=
simcall_comm_isend__get__src_buff(r1))
&& simcall_comm_wait__get__timeout(r2) <= 0)
return FALSE;
if ((r1->call == SIMCALL_COMM_IRECV)
- && (synchro2.comm.type == SIMIX_COMM_RECEIVE)
- && (synchro2.comm.dst_buff != simcall_comm_irecv__get__dst_buff(r1))
+ && (synchro2->comm.type == SIMIX_COMM_RECEIVE)
+ && (synchro2->comm.dst_buff != simcall_comm_irecv__get__dst_buff(r1))
&& simcall_comm_wait__get__timeout(r2) <= 0)
return FALSE;
}
SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r2) :
simcall_comm_irecv__get__rdv(r2);
- if (rdv != synchro1.comm.rdv_cpy
+ if (rdv != synchro1->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r1) <= 0)
return FALSE;
- if ((r2->issuer != synchro1.comm.src_proc)
- && (r2->issuer != synchro1.comm.dst_proc)
+ if ((r2->issuer != synchro1->comm.src_proc)
+ && (r2->issuer != synchro1->comm.dst_proc)
&& simcall_comm_wait__get__timeout(r1) <= 0)
return FALSE;
if ((r2->call == SIMCALL_COMM_ISEND)
- && (synchro1.comm.type == SIMIX_COMM_SEND)
- && (synchro1.comm.src_buff !=
+ && (synchro1->comm.type == SIMIX_COMM_SEND)
+ && (synchro1->comm.src_buff !=
simcall_comm_isend__get__src_buff(r2))
&& simcall_comm_wait__get__timeout(r1) <= 0)
return FALSE;
if ((r2->call == SIMCALL_COMM_IRECV)
- && (synchro1.comm.type == SIMIX_COMM_RECEIVE)
- && (synchro1.comm.dst_buff !=
+ && (synchro1->comm.type == SIMIX_COMM_RECEIVE)
+ && (synchro1->comm.dst_buff !=
simcall_comm_irecv__get__dst_buff(r2))
&& simcall_comm_wait__get__timeout(r1) <= 0)
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT
&& (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
- && (synchro1.comm.src_proc == NULL || synchro1.comm.dst_proc == NULL))
+ && (synchro1->comm.src_proc == NULL || synchro1->comm.dst_proc == NULL))
return FALSE;
if (r2->call == SIMCALL_COMM_WAIT
&& (r1->call == SIMCALL_COMM_WAIT || r1->call == SIMCALL_COMM_TEST)
- && (synchro2.comm.src_proc == NULL || synchro2.comm.dst_proc == NULL))
+ && (synchro2->comm.src_proc == NULL || synchro2->comm.dst_proc == NULL))
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_WAIT
- && synchro1.comm.src_buff == synchro2.comm.src_buff
- && synchro2.comm.dst_buff == synchro2.comm.dst_buff)
+ && synchro1->comm.src_buff == synchro2->comm.src_buff
+ && synchro2->comm.dst_buff == synchro2->comm.dst_buff)
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_WAIT
- && synchro1.comm.src_buff != NULL
- && synchro1.comm.dst_buff != NULL
- && synchro2.comm.src_buff != NULL
- && synchro2.comm.dst_buff != NULL
- && synchro1.comm.dst_buff != synchro2.comm.src_buff
- && synchro1.comm.dst_buff != synchro2.comm.dst_buff
- && synchro2.comm.dst_buff != synchro1.comm.src_buff)
+ && synchro1->comm.src_buff != NULL
+ && synchro1->comm.dst_buff != NULL
+ && synchro2->comm.src_buff != NULL
+ && synchro2->comm.dst_buff != NULL
+ && synchro1->comm.dst_buff != synchro2->comm.src_buff
+ && synchro1->comm.dst_buff != synchro2->comm.dst_buff
+ && synchro2->comm.dst_buff != synchro1->comm.src_buff)
return FALSE;
if (r1->call == SIMCALL_COMM_TEST &&
(simcall_comm_test__get__comm(r1) == NULL
- || synchro1.comm.src_buff == NULL
- || synchro1.comm.dst_buff == NULL))
+ || synchro1->comm.src_buff == NULL
+ || synchro1->comm.dst_buff == NULL))
return FALSE;
if (r2->call == SIMCALL_COMM_TEST &&
(simcall_comm_test__get__comm(r2) == NULL
- || synchro2.comm.src_buff == NULL
- || synchro2.comm.dst_buff == NULL))
+ || synchro2->comm.src_buff == NULL
+ || synchro2->comm.dst_buff == NULL))
return FALSE;
if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
- && synchro1.comm.src_buff == synchro2.comm.src_buff
- && synchro1.comm.dst_buff == synchro2.comm.dst_buff)
+ && synchro1->comm.src_buff == synchro2->comm.src_buff
+ && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
- && synchro1.comm.src_buff == synchro2.comm.src_buff
- && synchro1.comm.dst_buff == synchro2.comm.dst_buff)
+ && synchro1->comm.src_buff == synchro2->comm.src_buff
+ && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
return FALSE;
if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
- && synchro1.comm.src_buff != NULL
- && synchro1.comm.dst_buff != NULL
- && synchro2.comm.src_buff != NULL
- && synchro2.comm.dst_buff != NULL
- && synchro1.comm.dst_buff != synchro2.comm.src_buff
- && synchro1.comm.dst_buff != synchro2.comm.dst_buff
- && synchro2.comm.dst_buff != synchro1.comm.src_buff)
+ && synchro1->comm.src_buff != NULL
+ && synchro1->comm.dst_buff != NULL
+ && synchro2->comm.src_buff != NULL
+ && synchro2->comm.dst_buff != NULL
+ && synchro1->comm.dst_buff != synchro2->comm.src_buff
+ && synchro1->comm.dst_buff != synchro2->comm.dst_buff
+ && synchro2->comm.dst_buff != synchro1->comm.src_buff)
return FALSE;
if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
- && synchro1.comm.src_buff != NULL
- && synchro1.comm.dst_buff != NULL
- && synchro2.comm.src_buff != NULL
- && synchro2.comm.dst_buff != NULL
- && synchro1.comm.dst_buff != synchro2.comm.src_buff
- && synchro1.comm.dst_buff != synchro2.comm.dst_buff
- && synchro2.comm.dst_buff != synchro1.comm.src_buff)
+ && synchro1->comm.src_buff != NULL
+ && synchro1->comm.dst_buff != NULL
+ && synchro2->comm.src_buff != NULL
+ && synchro2->comm.dst_buff != NULL
+ && synchro1->comm.dst_buff != synchro2->comm.src_buff
+ && synchro1->comm.dst_buff != synchro2->comm.dst_buff
+ && synchro2->comm.dst_buff != synchro1->comm.src_buff)
return FALSE;
return TRUE;
}
-char *MC_request_to_string(smx_simcall_t req, int value)
+char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t request_type)
{
+ bool use_remote_comm;
+ switch(request_type) {
+ case MC_REQUEST_SIMIX:
+ use_remote_comm = true;
+ break;
+ case MC_REQUEST_EXECUTED:
+ case MC_REQUEST_INTERNAL:
+ use_remote_comm = false;
+ break;
+ }
+
const char* type = NULL;
char *args = NULL;
p = pointer_to_string(remote_act);
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process, &synchro,
- remote_act, sizeof(synchro));
-
- smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
- smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
+ smx_synchro_t act;
+ if (use_remote_comm) {
+ MC_process_read_simple(&mc_model_checker->process, &synchro,
+ remote_act, sizeof(synchro));
+ act = &synchro;
+ } else
+ act = remote_act;
+
+ smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
+ smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
src_proc ? src_proc->pid : 0,
src_proc ? MC_smx_process_get_host_name(src_proc) : "",
case SIMCALL_COMM_TEST: {
smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process, &synchro,
- remote_act, sizeof(synchro));
+ smx_synchro_t act;
+ if (use_remote_comm) {
+ MC_process_read_simple(&mc_model_checker->process, &synchro,
+ remote_act, sizeof(synchro));
+ act = &synchro;
+ } else
+ act = remote_act;
char* p;
- if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) {
+ if (act->comm.src_proc == NULL || act->comm.dst_proc == NULL) {
type = "Test FALSE";
p = pointer_to_string(remote_act);
args = bprintf("comm=%s", p);
type = "Test TRUE";
p = pointer_to_string(remote_act);
- smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
- smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
+ smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
+ smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
src_proc->pid,
MC_smx_process_get_name(src_proc),
if (!xbt_dynar_is_empty(&comms)) {
smx_synchro_t remote_sync;
MC_process_read_dynar_element(&mc_model_checker->process,
- &remote_sync, simcall_comm_waitany__get__comms(req), value);
+ &remote_sync, simcall_comm_waitany__get__comms(req), value,
+ sizeof(remote_sync));
char* p = pointer_to_string(remote_sync);
args = bprintf("comm=%s (%d of %lu)",
p, value + 1, xbt_dynar_length(&comms));
unsigned int MC_request_testany_fail(smx_simcall_t req)
{
- unsigned int cursor;
- smx_synchro_t action;
+ // Remote xbt_dynar_foreach on simcall_comm_testany__get__comms(req).
+
+ // Read the dynar:
+ s_xbt_dynar_t comms;
+ MC_process_read_simple(&mc_model_checker->process,
+ &comms, simcall_comm_testany__get__comms(req), sizeof(comms));
+
+ // Read ther dynar buffer:
+ size_t buffer_size = comms.elmsize * comms.used;
+ char buffer[buffer_size];
+ MC_process_read_simple(&mc_model_checker->process,
+ buffer, comms.data, buffer_size);
+
+ // Iterate over the elements:
+ assert(comms.elmsize == sizeof(smx_synchro_t));
+ unsigned cursor;
+ for (cursor=0; cursor != comms.used; ++cursor) {
+
+ // Get the element:
+ smx_synchro_t remote_action;
+ memcpy(buffer + comms.elmsize * cursor, &remote_action, sizeof(remote_action));
+
+ // Dereference the pointer:
+ s_smx_synchro_t action;
+ MC_process_read_simple(&mc_model_checker->process,
+ &action, remote_action, sizeof(action));
- xbt_dynar_foreach(simcall_comm_testany__get__comms(req), cursor, action) {
- // FIXME, remote access to comm object
- if (action->comm.src_proc && action->comm.dst_proc)
+ // Finally so something useful about it:
+ if (action.comm.src_proc && action.comm.dst_proc)
return FALSE;
}
break;
case SIMCALL_COMM_WAITANY: {
- smx_synchro_t act;
MC_process_read_dynar_element(
- &mc_model_checker->process, &act, simcall_comm_waitany__get__comms(req),
- idx);
+ &mc_model_checker->process, &remote_act, simcall_comm_waitany__get__comms(req),
+ idx, sizeof(remote_act));
}
break;
case SIMCALL_COMM_TESTANY: {
- s_smx_synchro_t act;
MC_process_read_dynar_element(
- &mc_model_checker->process, &act, simcall_comm_testany__get__comms(req),
- idx);
+ &mc_model_checker->process, &remote_act, simcall_comm_testany__get__comms(req),
+ idx, sizeof(remote_act));
}
break;
