#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 "mc_xbt.hpp"
+#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;
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);
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. */
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];
+ for (auto& p : mc_model_checker->process().simix_processes()) {
+ mc_procstate_t procstate = &state->proc_status[p.copy.pid];
const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
- if (process->pid == issuer->pid) {
+ if (p.copy.pid == issuer->pid) {
procstate->state = MC_MORE_INTERLEAVE;
break;
}
- );
+ }
}
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) {
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;
- 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;
}
}