X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..82cf3d43c742ba91f7c78bae73a0926c8ca71cd6:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index bdda1e75d9..df92ccde5f 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -31,17 +31,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_safety, mc, 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::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 ***"); @@ -96,8 +89,8 @@ void SafetyChecker::run() 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++;