#include <sys/wait.h>
#include <memory>
-#include <algorithm>
+
+#include <boost/range/algorithm.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.h>
* \brief Save the current state
* \return Snapshot of the current state.
*/
-VisitedState::VisitedState()
+VisitedState::VisitedState(unsigned long state_number)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
this->heap_bytes_used = mmalloc_get_bytes_used_remote(
this->nb_processes =
mc_model_checker->process().simix_processes().size();
- this->system_state = simgrid::mc::take_snapshot(mc_stats->expanded_states);
- this->num = mc_stats->expanded_states;
+ this->system_state = simgrid::mc::take_snapshot(state_number);
+ this->num = state_number;
this->other_num = -1;
}
{
while (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(states_.begin(), states_.end(),
+ auto min_element = boost::range::min_element(states_,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
return a->num < b->num;
});
/**
* \brief Checks whether a given state has already been visited by the algorithm.
*/
-std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(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)
{
std::unique_ptr<simgrid::mc::VisitedState> new_state =
- std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState());
+ std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState(state_number));
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.get(), new_state->num, graph_state->num);
- auto range = std::equal_range(states_.begin(), states_.end(),
+ auto range = boost::range::equal_range(states_,
new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
if (compare_snpashots)