-/* 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 <assert.h>
-#include "../simix/smx_private.h"
-#include "xbt/fifo.h"
-#include "mc_state.h"
-#include "mc_request.h"
-#include "mc_private.h"
-#include "mc_comm_pattern.h"
-#include "mc_smx.h"
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
+#include <xbt/fifo.h>
+
+#include "src/simix/smx_private.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_xbt.hpp"
+
+using simgrid::mc::remote;
extern "C" {
state->max_pid = MC_smx_get_maxpid();
state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
- state->system_state = NULL;
+ state->system_state = nullptr;
state->num = ++mc_stats->expanded_states;
state->in_visited_states = 0;
- state->incomplete_comm_pattern = NULL;
+ state->incomplete_comm_pattern = nullptr;
/* Stateful model checking */
if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){
- state->system_state = MC_take_snapshot(state->num);
+ state->system_state = simgrid::mc::take_snapshot(state->num);
if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
MC_state_copy_incomplete_communications_pattern(state);
MC_state_copy_index_communications_pattern(state);
*/
void MC_state_delete(mc_state_t state, int free_snapshot){
if (state->system_state && free_snapshot){
- MC_free_snapshot(state->system_state);
+ delete state->system_state;
}
if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
xbt_free(state->index_comm);
state->executed_req = *req;
state->req_num = value;
- smx_process_t process = NULL;
+ smx_process_t process = nullptr;
/* 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. */
switch (req->call) {
- case SIMCALL_COMM_WAITANY:
+ case SIMCALL_COMM_WAITANY: {
state->internal_req.call = SIMCALL_COMM_WAIT;
state->internal_req.issuer = req->issuer;
- MC_process_read_dynar_element(&mc_model_checker->process(),
- &state->internal_comm, simcall_comm_waitany__get__comms(req),
- value, sizeof(state->internal_comm));
+ smx_synchro_t remote_comm;
+ read_element(mc_model_checker->process(),
+ &remote_comm, remote(simcall_comm_waitany__get__comms(req)),
+ value, sizeof(remote_comm));
+ mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
simcall_comm_wait__set__timeout(&state->internal_req, 0);
break;
+ }
case SIMCALL_COMM_TESTANY:
state->internal_req.call = SIMCALL_COMM_TEST;
state->internal_req.issuer = req->issuer;
- if (value > 0)
- MC_process_read_dynar_element(&mc_model_checker->process(),
- &state->internal_comm, simcall_comm_testany__get__comms(req),
- value, sizeof(state->internal_comm));
+ if (value > 0) {
+ smx_synchro_t remote_comm;
+ read_element(mc_model_checker->process(),
+ &remote_comm, remote(simcall_comm_testany__get__comms(req)),
+ value, sizeof(remote_comm));
+ mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
+ }
simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
simcall_comm_test__set__result(&state->internal_req, value);
case SIMCALL_COMM_WAIT:
state->internal_req = *req;
- MC_process_read_simple(&mc_model_checker->process(), &state->internal_comm ,
- simcall_comm_wait__get__comm(req), sizeof(state->internal_comm));
+ mc_model_checker->process().read_bytes(&state->internal_comm ,
+ sizeof(state->internal_comm), remote(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);
break;
case SIMCALL_COMM_TEST:
state->internal_req = *req;
- MC_process_read_simple(&mc_model_checker->process(), &state->internal_comm,
- simcall_comm_test__get__comm(req), sizeof(state->internal_comm));
+ mc_model_checker->process().read_bytes(&state->internal_comm,
+ sizeof(state->internal_comm), remote(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);
break;
if (procstate->state != MC_INTERLEAVE
&& procstate->state != MC_MORE_INTERLEAVE)
- return NULL;
+ return nullptr;
if (!MC_process_is_enabled(process))
- return NULL;
+ return nullptr;
switch (process->simcall.call) {
case SIMCALL_COMM_WAITANY:
*value = -1;
while (procstate->interleave_count <
- MC_process_read_dynar_length(&mc_model_checker->process(),
- simcall_comm_waitany__get__comms(&process->simcall))) {
+ read_length(mc_model_checker->process(),
+ remote(simcall_comm_waitany__get__comms(&process->simcall)))) {
if (MC_request_is_enabled_by_idx
(&process->simcall, procstate->interleave_count++)) {
*value = procstate->interleave_count - 1;
}
if (procstate->interleave_count >=
- MC_process_read_dynar_length(&mc_model_checker->process(),
- simcall_comm_waitany__get__comms(&process->simcall)))
+ simgrid::mc::read_length(mc_model_checker->process(),
+ simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall))))
procstate->state = MC_DONE;
if (*value != -1)
unsigned start_count = procstate->interleave_count;
*value = -1;
while (procstate->interleave_count <
- MC_process_read_dynar_length(&mc_model_checker->process(),
- simcall_comm_testany__get__comms(&process->simcall))) {
+ read_length(mc_model_checker->process(),
+ remote(simcall_comm_testany__get__comms(&process->simcall)))) {
if (MC_request_is_enabled_by_idx
(&process->simcall, procstate->interleave_count++)) {
*value = procstate->interleave_count - 1;
}
if (procstate->interleave_count >=
- MC_process_read_dynar_length(&mc_model_checker->process(),
- simcall_comm_testany__get__comms(&process->simcall)))
+ read_length(mc_model_checker->process(),
+ remote(simcall_comm_testany__get__comms(&process->simcall))))
procstate->state = MC_DONE;
if (*value != -1 || start_count == 0)
case SIMCALL_COMM_WAIT: {
smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall);
s_smx_synchro_t act;
- MC_process_read_simple(&mc_model_checker->process(),
- &act, remote_act, sizeof(act));
+ mc_model_checker->process().read_bytes(
+ &act, sizeof(act), remote(remote_act));
if (act.comm.src_proc && act.comm.dst_proc) {
*value = 0;
} else {
- if (act.comm.src_proc == NULL && act.comm.type == SIMIX_COMM_READY
+ if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY
&& act.comm.detached == 1)
*value = 0;
else
*value = 0;
return &process->simcall;
}
- return NULL;
+ return nullptr;
}
smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
{
- smx_process_t process = NULL;
+ smx_process_t process = nullptr;
MC_EACH_SIMIX_PROCESS(process,
smx_simcall_t res = MC_state_get_request_for_process(state, value, process);
if (res)
return res;
);
- return NULL;
+ return nullptr;
}
}
