#include <memory>
#include <algorithm>
-#include <xbt/automaton.h>
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
+#include <xbt/dynar.hpp>
#include <xbt/fifo.h>
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_safety.h"
-#include "src/mc/mc_liveness.h"
#include "src/mc/mc_private.h"
#include "src/mc/Process.hpp"
#include "src/mc/mc_smx.h"
std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
-static int is_exploration_stack_state(simgrid::mc::VisitedState* state){
- xbt_fifo_item_t item = xbt_fifo_get_first_item(mc_stack);
- while (item) {
- if (((mc_state_t)xbt_fifo_get_item_content(item))->num == state->num){
- ((mc_state_t)xbt_fifo_get_item_content(item))->in_visited_states = 0;
- return 1;
- }
- item = xbt_fifo_get_next_item(item);
- }
- return 0;
-}
-
/**
* \brief Save the current state
* \return Snapshot of the current state.
VisitedState::~VisitedState()
{
- if(!is_exploration_stack_state(this))
- delete this->system_state;
}
-VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, mc_state_t graph_state)
+static void prune_visited_states()
{
- simgrid::mc::Process* process = &(mc_model_checker->process());
-
- this->graph_state = graph_state;
- if(this->graph_state->system_state == nullptr)
- this->graph_state->system_state = simgrid::mc::take_snapshot(pair_num);
- this->heap_bytes_used = mmalloc_get_bytes_used_remote(
- process->get_heap()->heaplimit,
- process->get_malloc_info());
-
- this->nb_processes =
- mc_model_checker->process().simix_processes().size();
-
- this->automaton_state = automaton_state;
- this->num = pair_num;
- this->other_num = -1;
- this->acceptance_removed = 0;
- this->visited_removed = 0;
- this->acceptance_pair = 0;
- this->atomic_propositions = simgrid::xbt::unique_ptr<s_xbt_dynar_t>(
- xbt_dynar_new(sizeof(int), nullptr));
-
- unsigned int cursor = 0;
- int value;
- xbt_dynar_foreach(atomic_propositions, cursor, value)
- xbt_dynar_push_as(this->atomic_propositions.get(), int, value);
-}
-
-static int is_exploration_stack_pair(simgrid::mc::VisitedPair* pair){
- xbt_fifo_item_t item = xbt_fifo_get_first_item(mc_stack);
- while (item) {
- if (((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->num == pair->num){
- ((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->visited_pair_removed = 1;
- return 1;
- }
- item = xbt_fifo_get_next_item(item);
+ while (visited_states.size() > (std::size_t) _sg_mc_visited) {
+ XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
+ auto min_element = std::min_element(visited_states.begin(), visited_states.end(),
+ [](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
+ return a->num < b->num;
+ });
+ xbt_assert(min_element != visited_states.end());
+ // and drop it:
+ visited_states.erase(min_element);
+ XBT_DEBUG("Remove visited state (maximum number of stored states reached)");
}
- return 0;
}
-VisitedPair::~VisitedPair()
+static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
{
- if( !is_exploration_stack_pair(this))
- MC_state_delete(this->graph_state, 1);
+ 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);
}
-}
-}
-
-static
-bool some_communications_are_not_finished()
-{
- for (size_t current_process = 1; current_process < MC_smx_get_maxpid(); current_process++) {
- xbt_dynar_t pattern = xbt_dynar_get_as(
- incomplete_communications_pattern, current_process, xbt_dynar_t);
- if (!xbt_dynar_is_empty(pattern)) {
- XBT_DEBUG("Some communications are not finished, cannot stop the exploration ! State not visited.");
- return true;
- }
- }
- return false;
-}
-
-namespace simgrid {
-namespace mc {
-
/**
* \brief Checks whether a given state has already been visited by the algorithm.
*/
-std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(mc_state_t graph_state)
+std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State* graph_state, bool compare_snpashots)
{
- if (_sg_mc_visited == 0)
- return nullptr;
- /* If comm determinism verification, we cannot stop the exploration if some
- communications are not finished (at least, data are transfered). These communications
- are incomplete and they cannot be analyzed and compared with the initial pattern. */
- int partial_comm = (_sg_mc_comms_determinism || _sg_mc_send_determinism) &&
- some_communications_are_not_finished();
std::unique_ptr<simgrid::mc::VisitedState> new_state =
std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState());
graph_state->system_state = new_state->system_state;
graph_state->in_visited_states = 1;
- XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)", new_state->system_state, new_state->num, graph_state->num);
+ XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)",
+ new_state->system_state.get(), new_state->num, graph_state->num);
auto range = std::equal_range(visited_states.begin(), visited_states.end(),
new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
- if (_sg_mc_safety || (!partial_comm
- && initial_global_state->initial_communications_pattern_done)) {
+ if (compare_snpashots) {
for (auto i = range.first; i != range.second; ++i) {
auto& visited_state = *i;
XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, (unsigned long) visited_states.size());
visited_states.insert(range.first, std::move(new_state));
-
- if (visited_states.size() <= (std::size_t) _sg_mc_visited)
- return nullptr;
-
- // We have reached the maximum number of stored states;
-
- XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
-
- // Find the (index of the) older state (with the smallest num):
- int min2 = mc_stats->expanded_states;
- unsigned int index2 = 0;
-
- for (std::size_t cursor2 = 0; cursor2 != visited_states.size(); ++cursor2)
- if (!mc_model_checker->is_important_snapshot(
- *visited_states[cursor2]->system_state)
- && visited_states[cursor2]->num < min2) {
- index2 = cursor2;
- min2 = visited_states[cursor2]->num;
- }
-
- // and drop it:
- visited_states.erase(visited_states.begin() + index2);
- XBT_DEBUG("Remove visited state (maximum number of stored states reached)");
-
- return nullptr;
+ prune_visited_states();
+ return nullptr;
}
}
