/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "src/mc/mc_state.hpp"
#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_config.hpp"
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_smx.hpp"
-#include "src/mc/mc_state.hpp"
#include <boost/range/algorithm.hpp>
actorStates.resize(MC_smx_get_maxpid());
/* Stateful model checking */
if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
- system_state = simgrid::mc::take_snapshot(num);
+ system_state = std::make_shared<simgrid::mc::Snapshot>(num);
if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
MC_state_copy_incomplete_communications_pattern(this);
MC_state_copy_index_communications_pattern(this);
case SIMCALL_COMM_WAITANY:
state->transition.argument = -1;
while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall)) {
- if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) {
- state->transition.argument = procstate->times_considered - 1;
+ if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+ state->transition.argument = procstate->times_considered;
+ ++procstate->times_considered;
break;
}
+ ++procstate->times_considered;
}
if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall))
case SIMCALL_COMM_TESTANY: {
unsigned start_count = procstate->times_considered;
state->transition.argument = -1;
- while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall))
- if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) {
- state->transition.argument = procstate->times_considered - 1;
+ while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall)) {
+ if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+ state->transition.argument = procstate->times_considered;
+ ++procstate->times_considered;
break;
}
+ ++procstate->times_considered;
+ }
if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall))
procstate->setDone();
remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(&actor->simcall)));
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
mc_model_checker->process().read(temp_act, remote_act);
- simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
+ simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer();
if (act->src_actor_.get() && act->dst_actor_.get())
state->transition.argument = 0;
else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY &&
- act->detached == 1)
+ act->detached())
state->transition.argument = 0;
else
state->transition.argument = -1;
remote_comm =
mc_model_checker->process().read(remote(simcall_comm_waitany__get__comms(req) + state->transition.argument));
mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
- simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer());
+ simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer());
simcall_comm_wait__set__timeout(&state->internal_req, 0);
break;
}
mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
}
- simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer());
+ simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer());
simcall_comm_test__set__result(&state->internal_req, state->transition.argument);
break;
case SIMCALL_COMM_WAIT:
mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm),
remote(simcall_comm_wait__getraw__comm(req)));
- simcall_comm_wait__set__comm(&state->executed_req, state->internal_comm.getBuffer());
- simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer());
+ simcall_comm_wait__set__comm(&state->executed_req, state->internal_comm.get_buffer());
+ simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer());
break;
case SIMCALL_COMM_TEST:
mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm),
remote(simcall_comm_test__getraw__comm(req)));
- simcall_comm_test__set__comm(&state->executed_req, state->internal_comm.getBuffer());
- simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer());
+ simcall_comm_test__set__comm(&state->executed_req, state->internal_comm.get_buffer());
+ simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer());
break;
default:
{
for (auto& actor : mc_model_checker->process().actors()) {
/* Only consider the actors that were marked as interleaving by the checker algorithm */
- if (not state->actorStates[actor.copy.getBuffer()->get_pid()].isTodo())
+ if (not state->actorStates[actor.copy.get_buffer()->get_pid()].isTodo())
continue;
- smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.getBuffer());
+ smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.get_buffer());
if (res)
return res;
}