/* 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. */
/* 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/mc_private.h"
#include "src/mc/Process.hpp"
#include "src/mc/mc_smx.h"
#include "src/mc/VisitedState.hpp"
#include "src/mc/mc_private.h"
#include "src/mc/Process.hpp"
#include "src/mc/mc_smx.h"
#include "src/mc/VisitedState.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc,
- "Logging specific to state equaity detection mechanisms");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
return snapshot_compare(num1, s1, num2, s2);
}
return snapshot_compare(num1, s1, num2, s2);
}
VisitedState::VisitedState(unsigned long state_number)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
VisitedState::VisitedState(unsigned long state_number)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
process->get_heap()->heaplimit,
process->get_malloc_info());
process->get_heap()->heaplimit,
process->get_malloc_info());
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
auto min_element = boost::range::min_element(states_,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
auto min_element = boost::range::min_element(states_,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
*/
std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snpashots)
*/
std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snpashots)
XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)",
new_state->system_state.get(), 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 = boost::range::equal_range(states_,
- new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
+ auto range =
+ boost::range::equal_range(states_, new_state.get(), simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap());
- if (old_state->other_num == -1)
- new_state->other_num = old_state->num;
- else
- new_state->other_num = old_state->other_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;
if (dot_output == nullptr)
XBT_DEBUG("State %d already visited ! (equal to state %d)",
if (dot_output == nullptr)
XBT_DEBUG("State %d already visited ! (equal to state %d)",
- XBT_DEBUG(
- "State %d already visited ! (equal to state %d (state %d in dot_output))",
- new_state->num, old_state->num, new_state->other_num);
+ 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);
/* Replace the old state with the new one (with a bigger num)
(when the max number of visited states is reached, the oldest
/* Replace the old state with the new one (with a bigger num)
(when the max number of visited states is reached, the oldest
old_state->num, new_state->num);
visited_state = std::move(new_state);
old_state->num, new_state->num);
visited_state = std::move(new_state);