From 54b931da542487537ab6ec3c4c8f5a9ec06822a7 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 8 Aug 2022 01:17:54 +0200 Subject: [PATCH] kill a parameter that is always true --- src/mc/VisitedState.cpp | 42 +++++++++++++++++------------------- src/mc/VisitedState.hpp | 2 +- src/mc/explo/DFSExplorer.cpp | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp index 9c9270f85f..74c7147b1d 100644 --- a/src/mc/VisitedState.cpp +++ b/src/mc/VisitedState.cpp @@ -39,8 +39,8 @@ void VisitedStates::prune() } /** @brief Checks whether a given state has already been visited by the algorithm. */ -std::unique_ptr -VisitedStates::addVisitedState(unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snapshots) +std::unique_ptr VisitedStates::addVisitedState(unsigned long state_number, + simgrid::mc::State* graph_state) { auto new_state = std::make_unique(state_number, graph_state->get_actor_count()); graph_state->set_system_state(new_state->system_state); @@ -50,32 +50,30 @@ VisitedStates::addVisitedState(unsigned long state_number, simgrid::mc::State* g auto [range_begin, range_end] = boost::range::equal_range(states_, new_state.get(), compare_pair_by_actor_count_and_used_heap()); - if (compare_snapshots) - for (auto i = range_begin; i != range_end; ++i) { - auto& visited_state = *i; - if (*visited_state->system_state.get() == *new_state->system_state.get()) { - // The state has been visited: + for (auto i = range_begin; i != range_end; ++i) { + auto& visited_state = *i; + if (*visited_state->system_state.get() == *new_state->system_state.get()) { + // The state has been visited: - std::unique_ptr old_state = - std::move(visited_state); + std::unique_ptr old_state = std::move(visited_state); - if (old_state->original_num == -1) // I'm the copy of an original process - new_state->original_num = old_state->num; - else // I'm the copy of a copy - new_state->original_num = old_state->original_num; + if (old_state->original_num == -1) // I'm the copy of an original process + new_state->original_num = old_state->num; + else // I'm the copy of a copy + new_state->original_num = old_state->original_num; - XBT_DEBUG("State %ld already visited ! (equal to state %ld (state %ld in dot_output))", new_state->num, - old_state->num, new_state->original_num); + XBT_DEBUG("State %ld already visited ! (equal to state %ld (state %ld in dot_output))", new_state->num, + old_state->num, new_state->original_num); - /* Replace the old state with the new one (with a bigger num) - (when the max number of visited states is reached, the oldest - one is removed according to its number (= with the min number) */ - XBT_DEBUG("Replace visited state %ld with the new visited state %ld", old_state->num, new_state->num); + /* Replace the old state with the new one (with a bigger num) + (when the max number of visited states is reached, the oldest + one is removed according to its number (= with the min number) */ + XBT_DEBUG("Replace visited state %ld with the new visited state %ld", old_state->num, new_state->num); - visited_state = std::move(new_state); - return old_state; - } + visited_state = std::move(new_state); + return old_state; } + } XBT_DEBUG("Insert new visited state %ld (total : %lu)", new_state->num, (unsigned long)states_.size()); states_.insert(range_begin, std::move(new_state)); diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp index 50ef93f0b2..9cec57a224 100644 --- a/src/mc/VisitedState.hpp +++ b/src/mc/VisitedState.hpp @@ -30,7 +30,7 @@ class XBT_PRIVATE VisitedStates { public: void clear() { states_.clear(); } std::unique_ptr addVisitedState(unsigned long state_number, - simgrid::mc::State* graph_state, bool compare_snapshots); + simgrid::mc::State* graph_state); private: void prune(); diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp index 5cd594042d..9ef0daf463 100644 --- a/src/mc/explo/DFSExplorer.cpp +++ b/src/mc/explo/DFSExplorer.cpp @@ -156,7 +156,7 @@ void DFSExplorer::run() /* 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(next_state->get_num(), next_state.get(), true); + visited_state_ = visited_states_.addVisitedState(next_state->get_num(), next_state.get()); /* If this is a new state (or if we don't care about state-equality reduction) */ if (visited_state_ == nullptr) { -- 2.20.1