#include <cassert>
#include <cstdio>
-#include <list>
+#include <memory>
+#include <string>
+#include <vector>
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include "src/mc/Checker.hpp"
#include "src/mc/SafetyChecker.hpp"
#include "src/mc/VisitedState.hpp"
+#include "src/mc/Transition.hpp"
#include "src/xbt/mmalloc/mmprivate.h"
RecordTrace SafetyChecker::getRecordTrace() // override
{
RecordTrace res;
- for (auto const& state : stack_) {
- int value = 0;
- 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));
- }
+ for (auto const& state : stack_)
+ res.push_back(state->getRecordElement());
return res;
}
{
std::vector<std::string> trace;
for (auto const& state : stack_) {
- int 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);
- trace.push_back(req_str);
- xbt_free(req_str);
- }
+ int value = state->transition.argument;
+ smx_simcall_t req = &state->executed_req;
+ if (req)
+ trace.push_back(simgrid::mc::request_to_string(
+ req, value, simgrid::mc::RequestType::executed));
}
return trace;
}
{
this->init();
- int value;
- smx_simcall_t req = nullptr;
-
while (!stack_.empty()) {
/* Get current state */
XBT_DEBUG("**************************************************");
XBT_DEBUG(
- "Exploration depth=%zi (state=%p, num %d)(%u interleave)",
+ "Exploration depth=%zi (state=%p, num %d)(%zu interleave)",
stack_.size(), state, state->num,
- MC_state_interleave_size(state));
+ state->interleaveSize());
- /* 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() <= (std::size_t) _sg_mc_max_depth
- && (req = MC_state_get_request(state, &value)) != nullptr
- && visitedState_ == nullptr) {
+ // The interleave set is empty or the maximum depth is reached,
+ // let's back-track.
+ smx_simcall_t req = nullptr;
+ if (stack_.size() > (std::size_t) _sg_mc_max_depth
+ || (req = MC_state_get_request(state)) == nullptr
+ || visitedState_ != nullptr) {
+ int res = this->backtrack();
+ if (res)
+ return res;
+ else
+ continue;
+ }
- char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
- XBT_DEBUG("Execute: %s", req_str);
- xbt_free(req_str);
+ int req_num = state->transition.argument;
- if (dot_output != nullptr)
- req_str = simgrid::mc::request_get_dot_output(req, value);
+ // 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",
+ simgrid::mc::request_to_string(
+ req, req_num, simgrid::mc::RequestType::simix).c_str());
- MC_state_set_executed_request(state, req, value);
- mc_stats->executed_transitions++;
+ std::string req_str;
+ if (dot_output != nullptr)
+ req_str = simgrid::mc::request_get_dot_output(req, req_num);
- // TODO, bundle both operations in a single message
- // MC_execute_transition(req, value)
+ mc_stats->executed_transitions++;
- /* Answer the request */
- simgrid::mc::handle_simcall(req, value);
- mc_model_checker->wait_for_requests();
+ // TODO, bundle both operations in a single message
+ // MC_execute_transition(req, req_num)
- /* Create the new expanded state */
- std::unique_ptr<simgrid::mc::State> next_state =
- std::unique_ptr<simgrid::mc::State>(MC_state_new());
+ /* Answer the request */
+ mc_model_checker->handle_simcall(state->transition);
+ mc_model_checker->wait_for_requests();
- if (_sg_mc_termination && this->checkNonTermination(next_state.get())) {
- MC_show_non_termination();
- return SIMGRID_MC_EXIT_NON_TERMINATION;
- }
+ /* Create the new expanded state */
+ std::unique_ptr<simgrid::mc::State> next_state =
+ std::unique_ptr<simgrid::mc::State>(MC_state_new());
- if (_sg_mc_visited == 0
- || (visitedState_ = visitedStates_.addVisitedState(next_state.get(), true)) == nullptr) {
+ if (_sg_mc_termination && this->checkNonTermination(next_state.get())) {
+ MC_show_non_termination();
+ return SIMGRID_MC_EXIT_NON_TERMINATION;
+ }
- /* 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.get(), &p.copy);
- if (reductionMode_ != simgrid::mc::ReductionMode::none)
- break;
- }
+ if (_sg_mc_visited == 0
+ || (visitedState_ = visitedStates_.addVisitedState(next_state.get(), true)) == nullptr) {
- if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str);
+ /* 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)) {
+ next_state->interleave(&p.copy);
+ if (reductionMode_ != simgrid::mc::ReductionMode::none)
+ break;
+ }
- } else if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num, req_str);
+ if (dot_output != nullptr)
+ std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+ state->num, next_state->num, req_str.c_str());
- stack_.push_back(std::move(next_state));
+ } else if (dot_output != nullptr)
+ std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+ state->num,
+ visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num, req_str.c_str());
- if (dot_output != nullptr)
- xbt_free(req_str);
+ stack_.push_back(std::move(next_state));
+ }
- /* Let's loop again */
+ XBT_INFO("No property violation found.");
+ MC_print_statistics(mc_stats);
+ initial_global_state = nullptr;
+ return SIMGRID_MC_EXIT_SUCCESS;
+}
- /* The interleave set is empty or the maximum depth is reached, let's back-track */
- } else {
+int SafetyChecker::backtrack()
+{
+ 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.",
+ visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num);
+ } else
+ XBT_DEBUG("There are no more processes to interleave. (depth %zi)",
+ stack_.size() + 1);
+
+ stack_.pop_back();
+
+ visitedState_ = nullptr;
+
+ /* Check for deadlocks */
+ if (mc_model_checker->checkDeadlock()) {
+ MC_show_deadlock();
+ return SIMGRID_MC_EXIT_DEADLOCK;
+ }
- 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.",
- 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();
-
- visitedState_ = nullptr;
-
- /* Check for deadlocks */
- if (mc_model_checker->checkDeadlock()) {
- MC_show_deadlock();
- return SIMGRID_MC_EXIT_DEADLOCK;
- }
+ /* Traverse the stack backwards until a state with a non empty interleave
+ set is found, deleting all the states that have it empty in the way.
+ For each deleted state, check if the request that has generated it
+ (from it's predecesor state), depends on any other previous request
+ executed before it. If it does then add it to the interleave set of the
+ state that executed that previous request. */
- /* Traverse the stack backwards until a state with a non empty interleave
- set is found, deleting all the states that have it empty in the way.
- For each deleted state, check if the request that has generated it
- (from it's predecesor state), depends on any other previous request
- executed before it. If it does then add it to the interleave set of the
- state that executed that previous request. */
-
- while (!stack_.empty()) {
- 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.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->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);
- 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.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_process_is_done(prev_state, issuer))
- MC_state_interleave_process(prev_state, issuer);
- else
- XBT_DEBUG("Process %p is in done set", req->issuer);
-
- break;
-
- } else if (req->issuer == MC_state_get_internal_request(prev_state)->issuer) {
-
- XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call);
- break;
-
- } else {
-
- const smx_process_t previous_issuer = MC_smx_simcall_get_issuer(MC_state_get_internal_request(prev_state));
- XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant",
- req->call, issuer->pid, state->num,
- MC_state_get_internal_request(prev_state)->call,
- previous_issuer->pid,
- prev_state->num);
-
- }
+ while (!stack_.empty()) {
+ std::unique_ptr<simgrid::mc::State> state = std::move(stack_.back());
+ stack_.pop_back();
+ if (reductionMode_ == simgrid::mc::ReductionMode::dpor) {
+ smx_simcall_t req = &state->internal_req;
+ 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->get();
+ if (reductionMode_ != simgrid::mc::ReductionMode::none
+ && simgrid::mc::request_depend(req, &prev_state->internal_req)) {
+ if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
+ XBT_DEBUG("Dependent Transitions:");
+ int value = prev_state->transition.argument;
+ smx_simcall_t prev_req = &prev_state->executed_req;
+ XBT_DEBUG("%s (state=%d)",
+ simgrid::mc::request_to_string(
+ prev_req, value, simgrid::mc::RequestType::internal).c_str(),
+ prev_state->num);
+ value = state->transition.argument;
+ prev_req = &state->executed_req;
+ XBT_DEBUG("%s (state=%d)",
+ simgrid::mc::request_to_string(
+ prev_req, value, simgrid::mc::RequestType::executed).c_str(),
+ state->num);
}
- }
- 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(std::move(state));
- simgrid::mc::replay(stack_);
- XBT_DEBUG("Back-tracking to state %d at depth %zi done",
- stack_.back()->num, stack_.size());
+ if (!prev_state->processStates[issuer->pid].isDone())
+ prev_state->interleave(issuer);
+ else
+ XBT_DEBUG("Process %p is in done set", req->issuer);
+
break;
+
+ } else if (req->issuer == prev_state->internal_req.issuer) {
+
+ XBT_DEBUG("Simcall %d and %d with same issuer", req->call, prev_state->internal_req.call);
+ break;
+
} else {
- XBT_DEBUG("Delete state %d at depth %zi",
- state->num, stack_.size() + 1);
+
+ const smx_process_t previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req);
+ XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant",
+ req->call, issuer->pid, state->num,
+ prev_state->internal_req.call,
+ previous_issuer->pid,
+ prev_state->num);
+
}
}
}
- }
- XBT_INFO("No property violation found.");
- MC_print_statistics(mc_stats);
- initial_global_state = nullptr;
+ if (state->interleaveSize()
+ && 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(std::move(state));
+ simgrid::mc::replay(stack_);
+ XBT_DEBUG("Back-tracking to state %d at depth %zi done",
+ stack_.back()->num, stack_.size());
+ break;
+ } else {
+ XBT_DEBUG("Delete state %d at depth %zi",
+ state->num, stack_.size() + 1);
+ }
+ }
return SIMGRID_MC_EXIT_SUCCESS;
}
/* 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.get(), &p.copy);
+ initial_state->interleave(&p.copy);
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}