-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "mc_safety.h"
#include "mc_private.h"
#include "mc_smx.h"
+#include "mc_xbt.hpp"
+
+using simgrid::mc::remote;
extern "C" {
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)
+static inline
+smx_synchro_t MC_get_comm(smx_simcall_t r)
{
- if (mc_reduce_kind == e_mc_reduce_none)
- return TRUE;
-
- if (r1->issuer == r2->issuer)
- return FALSE;
+ switch (r->call ) {
+ case SIMCALL_COMM_WAIT:
+ return simcall_comm_wait__get__comm(r);
+ case SIMCALL_COMM_TEST:
+ return simcall_comm_test__get__comm(r);
+ default:
+ return nullptr;
+ }
+}
- /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */
- if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
- || (r2->call == SIMCALL_COMM_WAIT
- && simcall_comm_wait__get__timeout(r2) > 0))
- return TRUE;
+static inline
+smx_rdv_t MC_get_rdv(smx_simcall_t r)
+{
+ switch(r->call) {
+ case SIMCALL_COMM_ISEND:
+ return simcall_comm_isend__get__rdv(r);
+ case SIMCALL_COMM_IRECV:
+ return simcall_comm_irecv__get__rdv(r);
+ default:
+ return nullptr;
+ }
+}
+// Does half the job
+static inline
+int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
+{
if (r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_IRECV)
return FALSE;
// Those are internal requests, we do not need indirection
// because those objects are copies:
- smx_synchro_t synchro1 = NULL, synchro2 = NULL;
- if (r1->call == SIMCALL_COMM_WAIT) {
- synchro1 = simcall_comm_wait__get__comm(r1);
- }
- if (r2->call == SIMCALL_COMM_WAIT) {
- synchro2 = simcall_comm_wait__get__comm(r2);
- }
- if (r1->call == SIMCALL_COMM_TEST) {
- synchro1 = simcall_comm_test__get__comm(r1);
- }
- if (r2->call == SIMCALL_COMM_TEST) {
- synchro2 = simcall_comm_test__get__comm(r2);
- }
+ smx_synchro_t synchro1 = MC_get_comm(r1);
+ smx_synchro_t synchro2 = MC_get_comm(r2);
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT) {
- smx_rdv_t rdv =
- r1->call ==
- SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r1) :
- simcall_comm_irecv__get__rdv(r1);
+ smx_rdv_t rdv = MC_get_rdv(r1);
if (rdv != synchro2->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r2) <= 0)
return FALSE;
}
- if ((r2->call == SIMCALL_COMM_ISEND || r2->call == SIMCALL_COMM_IRECV)
- && r1->call == SIMCALL_COMM_WAIT) {
-
- smx_rdv_t rdv =
- r2->call ==
- SIMCALL_COMM_ISEND ? simcall_comm_isend__get__rdv(r2) :
- simcall_comm_irecv__get__rdv(r2);
-
- 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)
- && 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 !=
- 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 !=
- simcall_comm_irecv__get__dst_buff(r2))
- && simcall_comm_wait__get__timeout(r1) <= 0)
- return FALSE;
- }
-
/* FIXME: the following rule assumes that the result of the
* isend/irecv call is not stored in a buffer used in the
* test call. */
&& r2->call == SIMCALL_COMM_TEST)
return FALSE; */
- /* FIXME: the following rule assumes that the result of the
- * isend/irecv call is not stored in a buffer used in the
- * test call.*/
- /*if( (r2->call == SIMCALL_COMM_ISEND || r2->call == SIMCALL_COMM_IRECV)
- && r1->call == SIMCALL_COMM_TEST)
- return FALSE; */
-
- if (r1->call == SIMCALL_COMM_ISEND && r2->call == SIMCALL_COMM_ISEND
- && simcall_comm_isend__get__rdv(r1) != simcall_comm_isend__get__rdv(r2))
- return FALSE;
-
- if (r1->call == SIMCALL_COMM_IRECV && r2->call == SIMCALL_COMM_IRECV
- && simcall_comm_irecv__get__rdv(r1) != simcall_comm_irecv__get__rdv(r2))
- 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))
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))
- 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)
- 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)
- 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))
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))
- 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)
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)
- 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.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)
+ return TRUE;
+}
+
+// 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)
+ return TRUE;
+
+ if (r1->issuer == r2->issuer)
return FALSE;
- return TRUE;
+ /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */
+ if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
+ || (r2->call == SIMCALL_COMM_WAIT
+ && simcall_comm_wait__get__timeout(r2) > 0))
+ return TRUE;
+
+ if (r1->call != r2->call)
+ return MC_request_depend_asymmetric(r1, r2)
+ && MC_request_depend_asymmetric(r2, r1);
+
+ // Those are internal requests, we do not need indirection
+ // because those objects are copies:
+ smx_synchro_t synchro1 = MC_get_comm(r1);
+ smx_synchro_t synchro2 = MC_get_comm(r2);
+
+ switch(r1->call) {
+ case SIMCALL_COMM_ISEND:
+ return simcall_comm_isend__get__rdv(r1) == simcall_comm_isend__get__rdv(r2);
+ case SIMCALL_COMM_IRECV:
+ return simcall_comm_irecv__get__rdv(r1) == simcall_comm_irecv__get__rdv(r2);
+ case SIMCALL_COMM_WAIT:
+ if (synchro1->comm.src_buff == synchro2->comm.src_buff
+ && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
+ return FALSE;
+ else if (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;
+ else
+ return TRUE;
+ default:
+ return TRUE;
+ }
}
static char *pointer_to_string(void *pointer)
char *MC_request_to_string(smx_simcall_t req, int value, e_mc_request_type_t request_type)
{
- bool use_remote_comm = false;
+ bool use_remote_comm = true;
switch(request_type) {
case MC_REQUEST_SIMIX:
use_remote_comm = true;
type = "iSend";
char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
- if (issuer->smx_host)
+ if (issuer->host)
args =
bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
MC_smx_process_get_host_name(issuer),
// size_t size = size_pointer ? *size_pointer : 0;
size_t size = 0;
if (remote_size)
- MC_process_read_simple(&mc_model_checker->process, &size,
- remote_size, sizeof(size));
+ mc_model_checker->process().read_bytes(&size, sizeof(size),
+ remote(remote_size));
type = "iRecv";
char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
char* bs = buff_size_to_string(size);
- if (issuer->smx_host)
+ if (issuer->host)
args =
bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
MC_smx_process_get_host_name(issuer),
s_smx_synchro_t synchro;
smx_synchro_t act;
if (use_remote_comm) {
- MC_process_read_simple(&mc_model_checker->process, &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
act = &synchro;
} else
act = remote_act;
s_smx_synchro_t synchro;
smx_synchro_t act;
if (use_remote_comm) {
- MC_process_read_simple(&mc_model_checker->process, &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
act = &synchro;
} else
act = remote_act;
case SIMCALL_COMM_WAITANY: {
type = "WaitAny";
s_xbt_dynar_t comms;
- MC_process_read_simple(&mc_model_checker->process,
- &comms, simcall_comm_waitany__get__comms(req), sizeof(comms));
+ mc_model_checker->process().read_bytes(
+ &comms, sizeof(comms), remote(simcall_comm_waitany__get__comms(req)));
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,
+ read_element(mc_model_checker->process(),
+ &remote_sync, remote(simcall_comm_waitany__get__comms(req)), value,
sizeof(remote_sync));
char* p = pointer_to_string(remote_sync);
args = bprintf("comm=%s (%d of %lu)",
} else {
type = "TestAny";
args =
- bprintf("(%d of %lu)", value + 1,
- MC_process_read_dynar_length(&mc_model_checker->process,
+ bprintf("(%d of %zu)", value + 1,
+ read_length(mc_model_checker->process(),
simcall_comm_testany__get__comms(req)));
}
break;
+ case SIMCALL_MUTEX_TRYLOCK:
case SIMCALL_MUTEX_LOCK: {
- type = "Mutex LOCK";
+ if (req->call == SIMCALL_MUTEX_LOCK)
+ type = "Mutex LOCK";
+ else
+ type = "Mutex TRYLOCK";
s_smx_mutex_t mutex;
- MC_process_read_simple(&mc_model_checker->process, &mutex,
- simcall_mutex_lock__get__mutex(req), sizeof(mutex));
+ mc_model_checker->process().read_bytes(&mutex, sizeof(mutex),
+ remote(
+ req->call == SIMCALL_MUTEX_LOCK
+ ? simcall_mutex_lock__get__mutex(req)
+ : simcall_mutex_trylock__get__mutex(req)
+ ));
s_xbt_swag_t mutex_sleeping;
- MC_process_read_simple(&mc_model_checker->process, &mutex_sleeping,
- mutex.sleeping, sizeof(mutex_sleeping));
+ mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping),
+ remote(mutex.sleeping));
args = bprintf("locked = %d, owner = %d, sleeping = %d",
mutex.locked,
// 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));
+ mc_model_checker->process().read_bytes(
+ &comms, sizeof(comms), remote(simcall_comm_testany__get__comms(req)));
// 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);
+ mc_model_checker->process().read_bytes(
+ buffer, buffer_size, remote(comms.data));
// Iterate over the elements:
assert(comms.elmsize == sizeof(smx_synchro_t));
for (cursor=0; cursor != comms.used; ++cursor) {
// Get the element:
- smx_synchro_t remote_action;
+ smx_synchro_t remote_action = NULL;
memcpy(&remote_action, buffer + comms.elmsize * cursor, sizeof(remote_action));
// Dereference the pointer:
s_smx_synchro_t action;
- MC_process_read_simple(&mc_model_checker->process,
- &action, remote_action, sizeof(action));
+ mc_model_checker->process().read_bytes(
+ &action, sizeof(action), remote(remote_action));
// Finally so something useful about it:
if (action.comm.src_proc && action.comm.dst_proc)
break;
case SIMCALL_COMM_WAITANY: {
- MC_process_read_dynar_element(
- &mc_model_checker->process, &remote_act, simcall_comm_waitany__get__comms(req),
+ read_element(
+ mc_model_checker->process(), &remote_act,
+ remote(simcall_comm_waitany__get__comms(req)),
idx, sizeof(remote_act));
}
break;
case SIMCALL_COMM_TESTANY: {
- MC_process_read_dynar_element(
- &mc_model_checker->process, &remote_act, simcall_comm_testany__get__comms(req),
+ read_element(
+ mc_model_checker->process(), &remote_act,
+ remote(simcall_comm_testany__get__comms(req)),
idx, sizeof(remote_act));
}
break;
}
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process,
- &synchro, remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(
+ &synchro, sizeof(synchro), remote(remote_act));
return synchro.comm.src_proc && synchro.comm.dst_proc;
}
switch (req->call) {
case SIMCALL_COMM_ISEND:
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] iSend", issuer->pid,
MC_smx_process_get_host_name(issuer));
break;
case SIMCALL_COMM_IRECV:
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] iRecv", issuer->pid,
MC_smx_process_get_host_name(issuer));
case SIMCALL_COMM_WAIT: {
if (value == -1) {
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] WaitTimeout", issuer->pid,
MC_smx_process_get_host_name(issuer));
} else {
smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
s_smx_synchro_t synchro;
- MC_process_read_simple(&mc_model_checker->process, &synchro,
- remote_act, sizeof(synchro));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(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);
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
MC_smx_process_get_host_name(issuer),
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));
+ mc_model_checker->process().read_bytes(&synchro,
+ sizeof(synchro), remote(remote_act));
if (synchro.comm.src_proc == NULL || synchro.comm.dst_proc == NULL) {
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] Test FALSE", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] Test FALSE", issuer->pid);
} else {
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] Test TRUE", issuer->pid,
MC_smx_process_get_host_name(issuer));
}
case SIMCALL_COMM_WAITANY: {
- unsigned long comms_size = MC_process_read_dynar_length(
- &mc_model_checker->process, simcall_comm_waitany__get__comms(req));
- if (issuer->smx_host)
+ unsigned long comms_size = read_length(
+ mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req)));
+ if (issuer->host)
label =
bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid,
MC_smx_process_get_host_name(issuer), value + 1,
case SIMCALL_COMM_TESTANY:
if (value == -1) {
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] TestAny FALSE", issuer->pid,
MC_smx_process_get_host_name(issuer));
else
label = bprintf("[(%lu)] TestAny FALSE", issuer->pid);
} else {
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid,
MC_smx_process_get_host_name(issuer), value + 1,
}
break;
+ case SIMCALL_MUTEX_TRYLOCK:
+ label = bprintf("[(%lu)] Mutex TRYLOCK", issuer->pid);
+ break;
+
case SIMCALL_MUTEX_LOCK:
- label = bprintf("[(%lu)] Mutex LOCK", req->issuer->pid);
+ label = bprintf("[(%lu)] Mutex LOCK", issuer->pid);
break;
case SIMCALL_MC_RANDOM:
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid,
MC_smx_process_get_host_name(issuer), value);
break;
case SIMCALL_MC_SNAPSHOT:
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid,
MC_smx_process_get_host_name(issuer));
break;
case SIMCALL_MC_COMPARE_SNAPSHOTS:
- if (issuer->smx_host)
+ if (issuer->host)
label =
bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid,
MC_smx_process_get_host_name(issuer));
