#include <assert.h>
+#include <algorithm>
+
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
+
#include "src/simix/smx_private.h"
-#include "xbt/fifo.h"
#include "src/mc/mc_state.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_private.h"
using simgrid::mc::remote;
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc,
"Logging specific to MC (state)");
/**
* \brief Creates a state data structure used by the exploration algorithm
*/
-mc_state_t MC_state_new()
+simgrid::mc::State* MC_state_new()
{
- mc_state_t state = xbt_new0(s_mc_state_t, 1);
-
- state->max_pid = MC_smx_get_maxpid();
- state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
- state->system_state = NULL;
+ simgrid::mc::State* state = new simgrid::mc::State();
+ std::memset(&state->internal_comm, 0, sizeof(state->internal_comm));
+ std::memset(&state->internal_req, 0, sizeof(state->internal_req));
+ std::memset(&state->executed_req, 0, sizeof(state->executed_req));
+ state->processStates.resize(MC_smx_get_maxpid());
state->num = ++mc_stats->expanded_states;
- state->in_visited_states = 0;
- state->incomplete_comm_pattern = NULL;
/* Stateful model checking */
if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){
state->system_state = simgrid::mc::take_snapshot(state->num);
return state;
}
-/**
- * \brief Deletes a state data structure
- * \param trans The state to be deleted
- */
-void MC_state_delete(mc_state_t state, int free_snapshot){
- if (state->system_state && free_snapshot){
- delete state->system_state;
- }
- if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
- xbt_free(state->index_comm);
- xbt_free(state->incomplete_comm_pattern);
- }
- xbt_free(state->proc_status);
- xbt_free(state);
-}
+namespace simgrid {
+namespace mc {
-void MC_state_interleave_process(mc_state_t state, smx_process_t process)
+State::State()
{
- assert(state);
- state->proc_status[process->pid].state = MC_INTERLEAVE;
- state->proc_status[process->pid].interleave_count = 0;
+ std::memset(&this->internal_comm, 0, sizeof(this->internal_comm));
+ std::memset(&this->internal_req, 0, sizeof(this->internal_req));
+ std::memset(&this->executed_req, 0, sizeof(this->executed_req));
}
-void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process)
+State::~State()
{
- if (state->proc_status[process->pid].state == MC_INTERLEAVE)
- state->proc_status[process->pid].state = MC_DONE;
+ xbt_free(this->incomplete_comm_pattern);
}
-unsigned int MC_state_interleave_size(mc_state_t state)
+std::size_t State::interleaveSize() const
{
- unsigned int i, size = 0;
+ return std::count_if(this->processStates.begin(), this->processStates.end(),
+ [](simgrid::mc::ProcessState const& state) { return state.interleave(); });
+}
- for (i = 0; i < state->max_pid; i++) {
- if ((state->proc_status[i].state == MC_INTERLEAVE)
- || (state->proc_status[i].state == MC_MORE_INTERLEAVE))
- size++;
- }
+}
+}
- return size;
+void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process)
+{
+ assert(state);
+ state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::interleave;
+ state->processStates[process->pid].interleave_count = 0;
}
-int MC_state_process_is_done(mc_state_t state, smx_process_t process)
+void MC_state_remove_interleave_process(simgrid::mc::State* state, smx_process_t process)
{
- return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE;
+ if (state->processStates[process->pid].state == simgrid::mc::ProcessInterleaveState::interleave)
+ state->processStates[process->pid].state = simgrid::mc::ProcessInterleaveState::done;
}
-void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req,
+void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req,
int value)
{
state->executed_req = *req;
state->req_num = value;
- smx_process_t process = NULL;
-
/* 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. */
case SIMCALL_MC_RANDOM: {
state->internal_req = *req;
int random_max = simcall_mc_random__get__max(req);
- if (value != random_max) {
- MC_EACH_SIMIX_PROCESS(process,
- mc_procstate_t procstate = &state->proc_status[process->pid];
+ 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 (process->pid == issuer->pid) {
- procstate->state = MC_MORE_INTERLEAVE;
+ if (p.copy.pid == issuer->pid) {
+ procstate->state = simgrid::mc::ProcessInterleaveState::more_interleave;
break;
}
- );
- }
+ }
break;
}
}
}
-smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value)
+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(mc_state_t state)
+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(
- mc_state_t state, int*value, smx_process_t process)
+ simgrid::mc::State* state, int*value, smx_process_t process)
{
- mc_procstate_t procstate = &state->proc_status[process->pid];
+ simgrid::mc::ProcessState* procstate = &state->processStates[process->pid];
- if (procstate->state != MC_INTERLEAVE
- && procstate->state != MC_MORE_INTERLEAVE)
- return NULL;
- if (!MC_process_is_enabled(process))
- return NULL;
+ if (!procstate->interleave())
+ return nullptr;
+ if (!simgrid::mc::process_is_enabled(process))
+ return nullptr;
switch (process->simcall.call) {
while (procstate->interleave_count <
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++)) {
+ if (simgrid::mc::request_is_enabled_by_idx(&process->simcall,
+ procstate->interleave_count++)) {
*value = 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 = MC_DONE;
+ procstate->state = simgrid::mc::ProcessInterleaveState::done;
if (*value != -1)
return &process->simcall;
*value = -1;
while (procstate->interleave_count <
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++)) {
+ 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;
break;
}
- }
if (procstate->interleave_count >=
read_length(mc_model_checker->process(),
remote(simcall_comm_testany__get__comms(&process->simcall))))
- procstate->state = MC_DONE;
+ procstate->state = simgrid::mc::ProcessInterleaveState::done;
if (*value != -1 || start_count == 0)
return &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) {
+ if (act.comm.src_proc && act.comm.dst_proc)
*value = 0;
- } else {
- if (act.comm.src_proc == NULL && act.comm.type == SIMIX_COMM_READY
+ else if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY
&& act.comm.detached == 1)
- *value = 0;
- else
- *value = -1;
- }
- procstate->state = MC_DONE;
+ *value = 0;
+ else
+ *value = -1;
+ procstate->state = simgrid::mc::ProcessInterleaveState::done;
return &process->simcall;
}
case SIMCALL_MC_RANDOM:
- if (procstate->state == MC_INTERLEAVE)
+ 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 = MC_DONE;
+ else if (state->req_num < simcall_mc_random__get__max(&process->simcall))
+ *value = state->req_num + 1;
+ procstate->state = simgrid::mc::ProcessInterleaveState::done;
return &process->simcall;
default:
- procstate->state = MC_DONE;
+ procstate->state = simgrid::mc::ProcessInterleaveState::done;
*value = 0;
return &process->simcall;
}
- return NULL;
+ return nullptr;
}
-smx_simcall_t MC_state_get_request(mc_state_t state, int *value)
+smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value)
{
- smx_process_t process = NULL;
- MC_EACH_SIMIX_PROCESS(process,
- smx_simcall_t res = MC_state_get_request_for_process(state, value, process);
+ for (auto& p : mc_model_checker->process().simix_processes()) {
+ smx_simcall_t res = MC_state_get_request_for_process(state, value, &p.copy);
if (res)
return res;
- );
-
- return NULL;
-}
-
+ }
+ return nullptr;
}
