#include <list>
#include <xbt/log.h>
-#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
-#include <xbt/fifo.h>
#include <xbt/sysdep.h>
#include "src/mc/mc_state.h"
#include "src/mc/mc_exit.h"
#include "src/mc/Checker.hpp"
#include "src/mc/SafetyChecker.hpp"
+#include "src/mc/VisitedState.hpp"
#include "src/xbt/mmalloc/mmprivate.h"
return snapshot_compare(num1, s1, num2, s2);
}
-bool SafetyChecker::is_exploration_stack_state(simgrid::mc::State* current_state)
+bool SafetyChecker::checkNonTermination(simgrid::mc::State* current_state)
{
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i)
- if(snapshot_compare(*i, current_state) == 0){
+ if (snapshot_compare(i->get(), current_state) == 0){
XBT_INFO("Non-progressive cycle : state %d -> state %d",
(*i)->num, current_state->num);
return true;
RecordTrace SafetyChecker::getRecordTrace() // override
{
RecordTrace res;
- for (simgrid::mc::State* state : stack_) {
+ for (auto const& state : stack_) {
int value = 0;
- smx_simcall_t saved_req = MC_state_get_executed_request(state, &value);
+ smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req);
const int pid = issuer->pid;
res.push_back(RecordTraceElement(pid, value));
std::vector<std::string> SafetyChecker::getTextualTrace() // override
{
std::vector<std::string> trace;
- for (simgrid::mc::State* state : stack_) {
+ for (auto const& state : stack_) {
int value;
- smx_simcall_t req = MC_state_get_executed_request(state, &value);
+ smx_simcall_t req = MC_state_get_executed_request(state.get(), &value);
if (req) {
char* req_str = simgrid::mc::request_to_string(
req, value, simgrid::mc::RequestType::executed);
{
this->init();
- char *req_str = nullptr;
int value;
smx_simcall_t req = nullptr;
- simgrid::mc::State* prev_state = nullptr;
- simgrid::mc::State* next_state = nullptr;
- xbt_fifo_item_t item = nullptr;
- std::unique_ptr<simgrid::mc::VisitedState> visited_state = nullptr;
while (!stack_.empty()) {
/* Get current state */
- simgrid::mc::State* state = stack_.back();
+ simgrid::mc::State* state = stack_.back().get();
XBT_DEBUG("**************************************************");
XBT_DEBUG(
- "Exploration depth=%zi (state=%p, num %d)(%u interleave, user_max_depth %d)",
+ "Exploration depth=%zi (state=%p, num %d)(%u interleave)",
stack_.size(), state, state->num,
- MC_state_interleave_size(state), user_max_depth_reached);
+ MC_state_interleave_size(state));
/* Update statistics */
mc_stats->visited_states++;
/* If there are processes to interleave and the maximum depth has not been reached
then perform one step of the exploration algorithm */
- if (stack_.size() <= _sg_mc_max_depth && !user_max_depth_reached
- && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) {
+ if (stack_.size() <= (std::size_t) _sg_mc_max_depth
+ && (req = MC_state_get_request(state, &value)) != nullptr
+ && visitedState_ == nullptr) {
- req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
+ char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
XBT_DEBUG("Execute: %s", req_str);
xbt_free(req_str);
mc_model_checker->wait_for_requests();
/* Create the new expanded state */
- next_state = MC_state_new();
+ std::unique_ptr<simgrid::mc::State> next_state =
+ std::unique_ptr<simgrid::mc::State>(MC_state_new());
- if(_sg_mc_termination && this->is_exploration_stack_state(next_state)){
+ if (_sg_mc_termination && this->checkNonTermination(next_state.get())) {
MC_show_non_termination();
return SIMGRID_MC_EXIT_NON_TERMINATION;
}
- if (_sg_mc_visited == 0 || (visited_state = simgrid::mc::is_visited_state(next_state, true)) == nullptr) {
+ if (_sg_mc_visited == 0
+ || (visitedState_ = visitedStates_.addVisitedState(next_state.get(), true)) == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
for (auto& p : mc_model_checker->process().simix_processes())
if (simgrid::mc::process_is_enabled(&p.copy)) {
- MC_state_interleave_process(next_state, &p.copy);
+ MC_state_interleave_process(next_state.get(), &p.copy);
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}
std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str);
} else if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str);
+ std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num, req_str);
- stack_.push_back(next_state);
+ stack_.push_back(std::move(next_state));
if (dot_output != nullptr)
xbt_free(req_str);
/* The interleave set is empty or the maximum depth is reached, let's back-track */
} else {
- if (stack_.size() > _sg_mc_max_depth || user_max_depth_reached
- || visited_state != nullptr) {
-
- if (user_max_depth_reached && visited_state == nullptr)
- XBT_DEBUG("User max depth reached !");
- else if (visited_state == nullptr)
+ if (stack_.size() > (std::size_t) _sg_mc_max_depth
+ || visitedState_ != nullptr) {
+ if (visitedState_ == nullptr)
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
else
- XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", visited_state->other_num == -1 ? visited_state->num : visited_state->other_num);
-
+ XBT_DEBUG("State already visited (equal to state %d),"
+ " exploration stopped on this path.",
+ visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num);
} else
XBT_DEBUG("There are no more processes to interleave. (depth %zi)",
stack_.size() + 1);
/* Trash the current state, no longer needed */
+ XBT_DEBUG("Delete state %d at depth %zi", state->num, stack_.size());
stack_.pop_back();
- XBT_DEBUG("Delete state %d at depth %zi", state->num, stack_.size() + 1);
- MC_state_delete(state, !state->in_visited_states ? 1 : 0);
- visited_state = nullptr;
+ visitedState_ = nullptr;
/* Check for deadlocks */
if (mc_model_checker->checkDeadlock()) {
state that executed that previous request. */
while (!stack_.empty()) {
- state = stack_.back();
+ std::unique_ptr<simgrid::mc::State> state = std::move(stack_.back());
stack_.pop_back();
if (reductionMode_ == simgrid::mc::ReductionMode::dpor) {
- req = MC_state_get_internal_request(state);
+ req = MC_state_get_internal_request(state.get());
if (req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK)
xbt_die("Mutex is currently not supported with DPOR, "
"use --cfg=model-check/reduction:none");
const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
- simgrid::mc::State* prev_state = *i;
+ simgrid::mc::State* prev_state = i->get();
if (reductionMode_ != simgrid::mc::ReductionMode::none
&& simgrid::mc::request_depend(req, MC_state_get_internal_request(prev_state))) {
if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
XBT_DEBUG("Dependent Transitions:");
smx_simcall_t prev_req = MC_state_get_executed_request(prev_state, &value);
- req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::internal);
+ char* req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::internal);
XBT_DEBUG("%s (state=%d)", req_str, prev_state->num);
xbt_free(req_str);
- prev_req = MC_state_get_executed_request(state, &value);
+ prev_req = MC_state_get_executed_request(state.get(), &value);
req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::executed);
XBT_DEBUG("%s (state=%d)", req_str, state->num);
xbt_free(req_str);
}
}
- if (MC_state_interleave_size(state)
- && stack_.size() < _sg_mc_max_depth) {
+ if (MC_state_interleave_size(state.get())
+ && 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 %zi",
state->num, stack_.size() + 1);
- stack_.push_back(state);
+ stack_.push_back(std::move(state));
simgrid::mc::replay(stack_);
XBT_DEBUG("Back-tracking to state %d at depth %zi done",
- state->num, stack_.size());
+ stack_.back()->num, stack_.size());
break;
} else {
XBT_DEBUG("Delete state %d at depth %zi",
state->num, stack_.size() + 1);
- MC_state_delete(state, !state->in_visited_states ? 1 : 0);
}
}
}
XBT_DEBUG("Starting the safety algorithm");
- simgrid::mc::visited_states.clear();
-
- simgrid::mc::State* initial_state = MC_state_new();
+ std::unique_ptr<simgrid::mc::State> initial_state =
+ std::unique_ptr<simgrid::mc::State>(MC_state_new());
XBT_DEBUG("**************************************************");
XBT_DEBUG("Initial state");
/* Get an enabled process and insert it in the interleave set of the initial state */
for (auto& p : mc_model_checker->process().simix_processes())
if (simgrid::mc::process_is_enabled(&p.copy)) {
- MC_state_interleave_process(initial_state, &p.copy);
+ MC_state_interleave_process(initial_state.get(), &p.copy);
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}
- stack_.push_back(initial_state);
+ stack_.push_back(std::move(initial_state));
/* Save the initial state */
initial_global_state = std::unique_ptr<s_mc_global_t>(new s_mc_global_t());
SafetyChecker::~SafetyChecker()
{
}
+
+Checker* createSafetyChecker(Session& session)
+{
+ return new SafetyChecker(session);
+}
}
}
