#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"
return snapshot_compare(num1, s1, num2, s2);
}
-bool SafetyChecker::checkNonDeterminism(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->get(), current_state) == 0){
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() <= (std::size_t) _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))
+ && visited_state == nullptr) {
char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
XBT_DEBUG("Execute: %s", req_str);
std::unique_ptr<simgrid::mc::State> next_state =
std::unique_ptr<simgrid::mc::State>(MC_state_new());
- if (_sg_mc_termination && this->checkNonDeterminism(next_state.get())){
+ if (_sg_mc_termination && this->checkNonTermination(next_state.get())) {
MC_show_non_termination();
return SIMGRID_MC_EXIT_NON_TERMINATION;
}
} else {
if (stack_.size() > (std::size_t) _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 (visited_state == 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);
SafetyChecker::~SafetyChecker()
{
}
+
+Checker* createSafetyChecker(Session& session)
+{
+ return new SafetyChecker(session);
+}
}
}