/* 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/checker/SafetyChecker.hpp"
#include "src/mc/Session.hpp"
-#include "src/mc/Transition.hpp"
#include "src/mc/VisitedState.hpp"
-#include "src/mc/checker/SafetyChecker.hpp"
+#include "src/mc/api/Transition.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
{
for (auto state = stack_.rbegin(); state != stack_.rend(); ++state)
if (api::get().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("Non-progressive cycle: state %ld -> state %ld", (*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 : get_textual_trace())
XBT_INFO(" %s", s.c_str());
- api::get().dump_record_path();
+ simgrid::mc::dumpRecordPath();
api::get().log_state();
throw TerminationError();
{
RecordTrace res;
for (auto const& state : stack_)
- res.push_back(state->get_transition());
+ res.push_back(*state->get_transition());
return res;
}
{
std::vector<std::string> trace;
for (auto const& state : stack_)
- trace.push_back(state->transition_.textual);
+ trace.push_back(state->get_transition()->to_string());
return trace;
}
void SafetyChecker::log_state() // override
{
- XBT_INFO("Expanded states = %lu", expanded_states_count_);
+ XBT_INFO("Expanded states = %ld", State::get_expanded_states());
XBT_INFO("Visited states = %lu", api::get().mc_get_visited_states());
- XBT_INFO("Executed transitions = %lu", api::get().mc_get_executed_trans());
+ XBT_INFO("Executed transitions = %lu", Transition::get_executed_transitions());
}
void SafetyChecker::run()
State* state = stack_.back().get();
XBT_DEBUG("**************************************************");
- XBT_VERB("Exploration depth=%zu (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num_,
+ XBT_VERB("Exploration depth=%zu (state=%p, num %ld)(%zu interleave)", stack_.size(), state, state->num_,
state->count_todo());
api::get().mc_inc_visited_states();
// Backtrack if we reached the maximum depth
if (stack_.size() > (std::size_t)_sg_mc_max_depth) {
if (reductionMode_ == ReductionMode::dpor) {
- XBT_ERROR("/!\\ Max depth reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\");
+ XBT_ERROR("/!\\ Max depth of %d reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\",
+ _sg_mc_max_depth.get());
XBT_ERROR("/!\\ If bad things happen, disable dpor with --cfg=model-check/reduction:none /!\\");
} else
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
// Backtrack if we are revisiting a state we saw previously
if (visited_state_ != nullptr) {
- XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.",
+ XBT_DEBUG("State already visited (equal to state %ld), exploration stopped on this path.",
visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num);
visited_state_ = nullptr;
continue;
}
- // Search an enabled transition in the current state; backtrack if the interleave set is empty
- // get_request also sets state.transition to be the one corresponding to the returned req
- smx_simcall_t req = api::get().mc_state_choose_request(state);
- // req is now the transition of the process that was selected to be executed
+ // Search for the next transition
+ int next = state->next_transition();
+
+ if (next < 0) { // If there is no more transition in the current state, backtrack.
- if (req == nullptr) {
- XBT_DEBUG("There remains %zu actors, but no more processes to interleave. (depth %zu)",
+ XBT_DEBUG("There remains %zu actors, but none to interleave (depth %zu).",
mc_model_checker->get_remote_process().actors().size(), stack_.size() + 1);
if (mc_model_checker->get_remote_process().actors().empty())
continue;
}
+ /* Actually answer the request: let execute the selected request (MCed does one step) */
+ state->set_transition(state->execute_next(next));
+
// If there are processes to interleave and the maximum depth has not been
// reached then perform one step of the exploration algorithm.
- XBT_DEBUG("Execute: %s", api::get().request_to_string(req, state->transition_.times_considered_).c_str());
+ XBT_DEBUG("Execute: %s", state->get_transition()->to_cstring());
std::string req_str;
if (dot_output != nullptr)
- req_str = api::get().request_get_dot_output(req, state->transition_.times_considered_);
-
- api::get().mc_inc_executed_trans();
-
- /* Actually answer the request: let execute the selected request (MCed does one step) */
- api::get().execute(state->transition_, &state->executed_req_);
+ req_str =
+ api::get().request_get_dot_output(state->get_transition()->aid_, state->get_transition()->times_considered_);
/* Create the new expanded state (copy the state of MCed into our MCer data) */
- ++expanded_states_count_;
- auto next_state = std::make_unique<State>(expanded_states_count_);
+ auto next_state = std::make_unique<State>();
if (_sg_mc_termination)
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)
- visited_state_ = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), true);
+ visited_state_ = visited_states_.addVisitedState(next_state->num_, next_state.get(), true);
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visited_state_ == nullptr) {
for (auto& remoteActor : actors) {
auto actor = remoteActor.copy.get_buffer();
if (get_session().actor_is_enabled(actor->get_pid())) {
- next_state->mark_todo(actor);
+ next_state->mark_todo(actor->get_pid());
if (reductionMode_ == ReductionMode::dpor)
break; // With DPOR, we take the first enabled transition
}
}
if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num_, next_state->num_, req_str.c_str());
+ std::fprintf(dot_output, "\"%ld\" -> \"%ld\" [%s];\n", state->num_, next_state->num_, req_str.c_str());
} else if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num_,
+ std::fprintf(dot_output, "\"%ld\" -> \"%ld\" [%s];\n", state->num_,
visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num,
req_str.c_str());
std::unique_ptr<State> state = std::move(stack_.back());
stack_.pop_back();
if (reductionMode_ == ReductionMode::dpor) {
- kernel::actor::ActorImpl* issuer = api::get().simcall_get_issuer(&state->executed_req_);
+ aid_t issuer_id = state->get_transition()->aid_;
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
State* prev_state = i->get();
- if (state->executed_req_.issuer_ == prev_state->executed_req_.issuer_) {
- XBT_DEBUG("Simcall %s and %s with same issuer", SIMIX_simcall_name(state->executed_req_),
- SIMIX_simcall_name(prev_state->executed_req_));
+ if (state->get_transition()->aid_ == prev_state->get_transition()->aid_) {
+ XBT_DEBUG("Simcall >>%s<< and >>%s<< with same issuer %ld", state->get_transition()->to_cstring(),
+ prev_state->get_transition()->to_cstring(), issuer_id);
break;
- } else if (api::get().simcall_check_dependency(&state->internal_req_, &prev_state->internal_req_)) {
- if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
- XBT_DEBUG("Dependent Transitions:");
- int value = prev_state->transition_.times_considered_;
- smx_simcall_t prev_req = &prev_state->executed_req_;
- XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value).c_str(), prev_state->num_);
- value = state->transition_.times_considered_;
- prev_req = &state->executed_req_;
- XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value).c_str(), state->num_);
- }
-
- if (not prev_state->actor_states_[issuer->get_pid()].is_done())
- prev_state->mark_todo(issuer);
+ } else if (prev_state->get_transition()->depends(state->get_transition())) {
+ XBT_VERB("Dependent Transitions:");
+ XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_cstring(), prev_state->num_);
+ XBT_VERB(" %s (state=%ld)", state->get_transition()->to_cstring(), state->num_);
+
+ if (not prev_state->actor_states_[issuer_id].is_done())
+ prev_state->mark_todo(issuer_id);
else
- XBT_DEBUG("Actor %s %ld is in done set", api::get().get_actor_name(issuer).c_str(), issuer->get_pid());
+ XBT_DEBUG("Actor %ld is in done set", issuer_id);
break;
} else {
- const kernel::actor::ActorImpl* previous_issuer = api::get().simcall_get_issuer(&prev_state->executed_req_);
- XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent",
- SIMIX_simcall_name(state->executed_req_), issuer->get_pid(), state->num_,
- SIMIX_simcall_name(prev_state->executed_req_), previous_issuer->get_pid(), prev_state->num_);
+ XBT_VERB("INDEPENDENT Transitions:");
+ XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_cstring(), prev_state->num_);
+ XBT_VERB(" %s (state=%ld)", state->get_transition()->to_cstring(), state->num_);
}
}
}
if (state->count_todo() && stack_.size() < (std::size_t)_sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
- XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num_, stack_.size() + 1);
+ XBT_DEBUG("Back-tracking to state %ld at depth %zu", state->num_, stack_.size() + 1);
stack_.push_back(std::move(state));
this->restore_state();
- XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num_, stack_.size());
+ XBT_DEBUG("Back-tracking to state %ld at depth %zu done", stack_.back()->num_, stack_.size());
break;
} else {
- XBT_DEBUG("Delete state %d at depth %zu", state->num_, stack_.size() + 1);
+ XBT_DEBUG("Delete state %ld at depth %zu", state->num_, stack_.size() + 1);
}
}
}
for (std::unique_ptr<State> const& state : stack_) {
if (state == stack_.back())
break;
- api::get().execute(state->transition_, &state->executed_req_);
+ state->get_transition()->replay();
/* Update statistics */
api::get().mc_inc_visited_states();
- api::get().mc_inc_executed_trans();
}
}
XBT_DEBUG("Starting the safety algorithm");
- ++expanded_states_count_;
- auto initial_state = std::make_unique<State>(expanded_states_count_);
+ auto initial_state = std::make_unique<State>();
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Initial state");
/* Get an enabled actor and insert it in the interleave set of the initial state */
auto actors = api::get().get_actors();
- for (auto& actor : actors)
- if (get_session().actor_is_enabled(actor.copy.get_buffer()->get_pid())) {
- initial_state->mark_todo(actor.copy.get_buffer());
- if (reductionMode_ != ReductionMode::none)
+ XBT_DEBUG("Initial state. %zu actors to consider", actors.size());
+ for (auto& actor : actors) {
+ aid_t aid = actor.copy.get_buffer()->get_pid();
+ if (get_session().actor_is_enabled(aid)) {
+ initial_state->mark_todo(aid);
+ if (reductionMode_ == ReductionMode::dpor) {
+ XBT_DEBUG("Actor %ld is TODO, DPOR is ON so let's go for this one.", aid);
break;
+ }
+ XBT_DEBUG("Actor %ld is TODO", aid);
}
+ }
stack_.push_back(std::move(initial_state));
}
