namespace simgrid {
namespace mc {
-static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* state2)
-{
- simgrid::mc::Snapshot* s1 = state1->system_state.get();
- simgrid::mc::Snapshot* s2 = state2->system_state.get();
- return snapshot_compare(s1, s2);
-}
-
-void SafetyChecker::checkNonTermination(simgrid::mc::State* current_state)
+void SafetyChecker::check_non_termination(simgrid::mc::State* current_state)
{
for (auto state = stack_.rbegin(); state != stack_.rend(); ++state)
- if (snapshot_compare(state->get(), current_state) == 0) {
+ if (snapshot_equal((*state)->system_state.get(), current_state->system_state.get())) {
XBT_INFO("Non-progressive cycle: state %d -> state %d", (*state)->num, current_state->num);
XBT_INFO("******************************************");
XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***");
XBT_INFO("******************************************");
XBT_INFO("Counter-example execution trace:");
- for (auto const& s : mc_model_checker->getChecker()->getTextualTrace())
+ for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
XBT_INFO(" %s", s.c_str());
simgrid::mc::dumpRecordPath();
- simgrid::mc::session->logState();
+ simgrid::mc::session->log_state();
throw simgrid::mc::TerminationError();
}
}
-RecordTrace SafetyChecker::getRecordTrace() // override
+RecordTrace SafetyChecker::get_record_trace() // override
{
RecordTrace res;
for (auto const& state : stack_)
return res;
}
-std::vector<std::string> SafetyChecker::getTextualTrace() // override
+std::vector<std::string> SafetyChecker::get_textual_trace() // override
{
std::vector<std::string> trace;
for (auto const& state : stack_) {
return trace;
}
-void SafetyChecker::logState() // override
+void SafetyChecker::log_state() // override
{
- XBT_INFO("Expanded states = %lu", expandedStatesCount_);
+ XBT_INFO("Expanded states = %lu", expanded_states_count_);
XBT_INFO("Visited states = %lu", mc_model_checker->visited_states);
XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions);
}
simgrid::mc::State* state = stack_.back().get();
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Exploration depth=%zu (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num,
- state->interleaveSize());
+ XBT_VERB("Exploration depth=%zu (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num,
+ state->interleaveSize());
mc_model_checker->visited_states++;
}
// Backtrack if we are revisiting a state we saw previously
- if (visitedState_ != nullptr) {
+ if (visited_state_ != nullptr) {
XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.",
- visitedState_->original_num == -1 ? visitedState_->num : visitedState_->original_num);
+ visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num);
- visitedState_ = nullptr;
+ visited_state_ = nullptr;
this->backtrack();
continue;
}
mc_model_checker->executed_transitions++;
/* Actually answer the request: let execute the selected request (MCed does one step) */
- this->getSession().execute(state->transition);
+ this->get_session().execute(state->transition);
/* Create the new expanded state (copy the state of MCed into our MCer data) */
std::unique_ptr<simgrid::mc::State> next_state =
- std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
+ std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expanded_states_count_));
if (_sg_mc_termination)
- this->checkNonTermination(next_state.get());
+ this->check_non_termination(next_state.get());
/* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */
if (_sg_mc_max_visited_states > 0)
- visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true);
+ visited_state_ = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), true);
/* If this is a new state (or if we don't care about state-equality reduction) */
- if (visitedState_ == nullptr) {
+ if (visited_state_ == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
for (auto& remoteActor : mc_model_checker->process().actors()) {
- auto actor = remoteActor.copy.getBuffer();
+ auto actor = remoteActor.copy.get_buffer();
if (simgrid::mc::actor_is_enabled(actor)) {
next_state->addInterleavingSet(actor);
if (reductionMode_ == simgrid::mc::ReductionMode::dpor)
} else if (dot_output != nullptr)
std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num,
- visitedState_->original_num == -1 ? visitedState_->num : visitedState_->original_num,
+ visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num,
req_str.c_str());
stack_.push_back(std::move(next_state));
}
XBT_INFO("No property violation found.");
- simgrid::mc::session->logState();
+ simgrid::mc::session->log_state();
}
void SafetyChecker::backtrack()
/* We found a back-tracking point, let's loop */
XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num, stack_.size() + 1);
stack_.push_back(std::move(state));
- this->restoreState();
+ this->restore_state();
XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num, stack_.size());
break;
} else {
}
}
-void SafetyChecker::restoreState()
+void SafetyChecker::restore_state()
{
/* Intermediate backtracking */
simgrid::mc::State* last_state = stack_.back().get();
if (last_state->system_state) {
- simgrid::mc::restore_snapshot(last_state->system_state);
+ last_state->system_state->restore(&mc_model_checker->process());
return;
}
/* Restore the initial state */
- simgrid::mc::session->restoreInitialState();
+ simgrid::mc::session->restore_initial_state();
/* Traverse the stack from the state at position start and re-execute the transitions */
for (std::unique_ptr<simgrid::mc::State> const& state : stack_) {
XBT_DEBUG("Starting the safety algorithm");
std::unique_ptr<simgrid::mc::State> initial_state =
- std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
+ std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expanded_states_count_));
XBT_DEBUG("**************************************************");
XBT_DEBUG("Initial state");
/* Get an enabled actor and insert it in the interleave set of the initial state */
for (auto& actor : mc_model_checker->process().actors())
- if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) {
- initial_state->addInterleavingSet(actor.copy.getBuffer());
+ if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) {
+ initial_state->addInterleavingSet(actor.copy.get_buffer());
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}