X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..af6d6b158ab3c99f190cb670b1918bbadaa9e250:/src/mc/VisitedState.cpp diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp index cb22a5757e..9c9270f85f 100644 --- a/src/mc/VisitedState.cpp +++ b/src/mc/VisitedState.cpp @@ -1,60 +1,36 @@ -/* Copyright (c) 2011-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2011-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "src/mc/VisitedState.hpp" +#include "src/mc/explo/Exploration.hpp" +#include "src/mc/mc_private.hpp" + #include #include - #include - #include -#include "xbt/log.h" -#include "xbt/sysdep.h" - -#include "src/mc/VisitedState.hpp" -#include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.hpp" -#include "src/mc/mc_smx.hpp" -#include "src/mc/remote/RemoteClient.hpp" - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms"); -namespace simgrid { -namespace mc { - -static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2) -{ - simgrid::mc::Snapshot* s1 = state1->system_state.get(); - simgrid::mc::Snapshot* s2 = state2->system_state.get(); - int num1 = state1->num; - int num2 = state2->num; - return snapshot_compare(num1, s1, num2, s2); -} +namespace simgrid::mc { /** @brief Save the current state */ -VisitedState::VisitedState(unsigned long state_number) : num(state_number) +VisitedState::VisitedState(unsigned long state_number, unsigned int actor_count) + : actor_count_(actor_count), num(state_number) { - simgrid::mc::RemoteClient* process = &(mc_model_checker->process()); - this->heap_bytes_used = mmalloc_get_bytes_used_remote( - process->get_heap()->heaplimit, - process->get_malloc_info()); - - this->actors_count = mc_model_checker->process().actors().size(); - - this->system_state = simgrid::mc::take_snapshot(state_number); - this->original_num = -1; + this->heap_bytes_used = mc_model_checker->get_remote_process().get_remote_heap_bytes(); + this->system_state = std::make_shared(state_number); } void VisitedStates::prune() { while (states_.size() > (std::size_t)_sg_mc_max_visited_states) { XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)"); - auto min_element = boost::range::min_element(states_, - [](std::unique_ptr& a, std::unique_ptr& b) { - return a->num < b->num; - }); + auto min_element = boost::range::min_element( + states_, [](const std::unique_ptr& a, + const std::unique_ptr& b) { return a->num < b->num; }); xbt_assert(min_element != states_.end()); // and drop it: states_.erase(min_element); @@ -62,24 +38,22 @@ 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_snpashots) +/** @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 new_state = - std::unique_ptr(new VisitedState(state_number)); - graph_state->system_state = new_state->system_state; - XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)", - new_state->system_state.get(), new_state->num, graph_state->num); + auto new_state = std::make_unique(state_number, graph_state->get_actor_count()); + graph_state->set_system_state(new_state->system_state); + XBT_DEBUG("Snapshot %p of visited state %ld (exploration stack state %ld)", new_state->system_state.get(), + new_state->num, graph_state->get_num()); - auto range = - boost::range::equal_range(states_, new_state.get(), simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap()); + auto [range_begin, range_end] = + boost::range::equal_range(states_, new_state.get(), compare_pair_by_actor_count_and_used_heap()); - if (compare_snpashots) - for (auto i = range.first; i != range.second; ++i) { + if (compare_snapshots) + for (auto i = range_begin; i != range_end; ++i) { auto& visited_state = *i; - if (snapshot_compare(visited_state.get(), new_state.get()) == 0) { + if (*visited_state->system_state.get() == *new_state->system_state.get()) { // The state has been visited: std::unique_ptr old_state = @@ -90,29 +64,23 @@ std::unique_ptr VisitedStates::addVisitedState( else // I'm the copy of a copy new_state->original_num = old_state->original_num; - if (dot_output == nullptr) - XBT_DEBUG("State %d already visited ! (equal to state %d)", - new_state->num, old_state->num); - else - XBT_DEBUG("State %d already visited ! (equal to state %d (state %d 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 %d with the new visited state %d", - old_state->num, new_state->num); + 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; } } - XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, (unsigned long) states_.size()); - states_.insert(range.first, std::move(new_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)); this->prune(); return nullptr; } -} -} +} // namespace simgrid::mc