#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_smx.h"
#include "src/mc/mc_xbt.hpp"
+#include "src/mc/Transition.hpp"
using simgrid::mc::remote;
/**
* \brief Creates a state data structure used by the exploration algorithm
*/
-simgrid::mc::State* MC_state_new()
+simgrid::mc::State* MC_state_new(unsigned long state_number)
{
simgrid::mc::State* state = new simgrid::mc::State();
state->processStates.resize(MC_smx_get_maxpid());
- state->num = ++mc_stats->expanded_states;
+ state->num = state_number;
/* Stateful model checking */
- if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){
+ if((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination){
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);
State::State()
{
- std::memset(&this->internal_comm, 0, sizeof(this->internal_comm));
+ std::memset(this->internal_comm.data(), 0, this->internal_comm.size());
std::memset(&this->internal_req, 0, sizeof(this->internal_req));
std::memset(&this->executed_req, 0, sizeof(this->executed_req));
}
std::size_t State::interleaveSize() const
{
return std::count_if(this->processStates.begin(), this->processStates.end(),
- [](simgrid::mc::ProcessState const& state) { return state.interleave(); });
+ [](simgrid::mc::ProcessState const& state) { return state.isToInterleave(); });
}
-}
-}
-
-void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process)
+Transition State::getTransition() const
{
- assert(state);
- state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::interleave;
- state->processStates[process->pid].interleave_count = 0;
+ return this->transition;
}
-smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value)
-{
- *value = state->req_num;
- return &state->executed_req;
}
-
-smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state)
-{
- return &state->internal_req;
}
static inline smx_simcall_t MC_state_get_request_for_process(
- simgrid::mc::State* state, int*value, smx_process_t process)
+ simgrid::mc::State* state, smx_process_t process)
{
simgrid::mc::ProcessState* procstate = &state->processStates[process->pid];
+ state->transition.pid = -1;
+ state->transition.argument = -1;
- if (!procstate->interleave())
+ if (!procstate->isToInterleave())
return nullptr;
if (!simgrid::mc::process_is_enabled(process))
return nullptr;
smx_simcall_t req = nullptr;
switch (process->simcall.call) {
case SIMCALL_COMM_WAITANY:
- *value = -1;
+ state->transition.argument = -1;
while (procstate->interleave_count <
read_length(mc_model_checker->process(),
remote(simcall_comm_waitany__get__comms(&process->simcall)))) {
if (simgrid::mc::request_is_enabled_by_idx(&process->simcall,
procstate->interleave_count++)) {
- *value = procstate->interleave_count - 1;
+ state->transition.argument = procstate->interleave_count - 1;
break;
}
}
if (procstate->interleave_count >=
simgrid::mc::read_length(mc_model_checker->process(),
simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall))))
- procstate->state = simgrid::mc::ProcessInterleaveState::done;
- if (*value != -1)
+ procstate->setDone();
+ if (state->transition.argument != -1)
req = &process->simcall;
break;
case SIMCALL_COMM_TESTANY: {
unsigned start_count = procstate->interleave_count;
- *value = -1;
+ state->transition.argument = -1;
while (procstate->interleave_count <
read_length(mc_model_checker->process(),
remote(simcall_comm_testany__get__comms(&process->simcall))))
if (simgrid::mc::request_is_enabled_by_idx(&process->simcall,
procstate->interleave_count++)) {
- *value = procstate->interleave_count - 1;
+ state->transition.argument = procstate->interleave_count - 1;
break;
}
if (procstate->interleave_count >=
read_length(mc_model_checker->process(),
remote(simcall_comm_testany__get__comms(&process->simcall))))
- procstate->state = simgrid::mc::ProcessInterleaveState::done;
+ procstate->setDone();
- if (*value != -1 || start_count == 0)
+ if (state->transition.argument != -1 || start_count == 0)
req = &process->simcall;
break;
}
case SIMCALL_COMM_WAIT: {
- smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall);
- s_smx_synchro_t 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 == nullptr && act.comm.type == SIMIX_COMM_READY
- && act.comm.detached == 1)
- *value = 0;
+ simgrid::mc::RemotePtr<simgrid::simix::Comm> remote_act = remote(
+ static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(&process->simcall)));
+ simgrid::mc::Remote<simgrid::simix::Comm> temp_act;
+ mc_model_checker->process().read(temp_act, remote_act);
+ simgrid::simix::Comm* act = static_cast<simgrid::simix::Comm*>(temp_act.data());
+ if (act->src_proc && act->dst_proc)
+ state->transition.argument = 0;
+ else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY
+ && act->detached == 1)
+ state->transition.argument = 0;
else
- *value = -1;
- procstate->state = simgrid::mc::ProcessInterleaveState::done;
+ state->transition.argument = -1;
+ procstate->setDone();
req = &process->simcall;
break;
}
- case SIMCALL_MC_RANDOM:
- if (procstate->state == simgrid::mc::ProcessInterleaveState::interleave)
- *value = simcall_mc_random__get__min(&process->simcall);
- else if (state->req_num < simcall_mc_random__get__max(&process->simcall))
- *value = state->req_num + 1;
- procstate->state = simgrid::mc::ProcessInterleaveState::done;
+ case SIMCALL_MC_RANDOM: {
+ int min_value = simcall_mc_random__get__min(&process->simcall);
+ state->transition.argument = procstate->interleave_count + min_value;
+ procstate->interleave_count++;
+ if (state->transition.argument == simcall_mc_random__get__max(&process->simcall))
+ procstate->setDone();
req = &process->simcall;
break;
+ }
default:
- procstate->state = simgrid::mc::ProcessInterleaveState::done;
- *value = 0;
+ procstate->setDone();
+ state->transition.argument = 0;
req = &process->simcall;
break;
}
// Fetch the data of the request and translate it:
+ state->transition.pid = process->pid;
+
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
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));
+ state->transition.argument, sizeof(remote_comm));
+ mc_model_checker->process().read(state->internal_comm, remote(
+ static_cast<simgrid::simix::Comm*>(remote_comm)));
simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm);
simcall_comm_wait__set__timeout(&state->internal_req, 0);
break;
state->internal_req.call = SIMCALL_COMM_TEST;
state->internal_req.issuer = req->issuer;
- if (*value > 0) {
+ if (state->transition.argument > 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));
+ state->transition.argument, sizeof(remote_comm));
+ mc_model_checker->process().read(state->internal_comm, remote(
+ static_cast<simgrid::simix::Comm*>(remote_comm)));
}
simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
- simcall_comm_test__set__result(&state->internal_req, *value);
+ simcall_comm_test__set__result(&state->internal_req, state->transition.argument);
break;
case SIMCALL_COMM_WAIT:
simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
break;
- case SIMCALL_MC_RANDOM: {
- state->internal_req = *req;
- int random_max = simcall_mc_random__get__max(req);
- if (*value != random_max)
- for (auto& p : mc_model_checker->process().simix_processes()) {
- simgrid::mc::ProcessState* procstate = &state->processStates[p.copy.pid];
- const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
- if (p.copy.pid == issuer->pid) {
- procstate->state = simgrid::mc::ProcessInterleaveState::more_interleave;
- break;
- }
- }
- break;
- }
-
default:
state->internal_req = *req;
break;
return req;
}
-smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value)
+smx_simcall_t MC_state_get_request(simgrid::mc::State* state)
{
for (auto& p : mc_model_checker->process().simix_processes()) {
- smx_simcall_t res = MC_state_get_request_for_process(state, value, &p.copy);
+ smx_simcall_t res = MC_state_get_request_for_process(state, &p.copy);
if (res)
return res;
}
