-/* Copyright (c) 2011-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2019. 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/mc_private.hpp"
+
#include <unistd.h>
#include <sys/wait.h>
-
#include <memory>
-
#include <boost/range/algorithm.hpp>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_safety.h"
-#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");
namespace simgrid {
namespace mc {
-static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
+/** @brief Save the current state */
+VisitedState::VisitedState(unsigned long state_number) : num(state_number)
{
- 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);
-}
-
-/**
- * \brief Save the current state
- * \return Snapshot of the current state.
- */
-VisitedState::VisitedState(unsigned long state_number)
-{
- simgrid::mc::Process* process = &(mc_model_checker->process());
+ 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->num = state_number;
+ this->system_state = std::make_shared<simgrid::mc::Snapshot>(state_number);
this->original_num = -1;
}
-VisitedState::~VisitedState()
-{
-}
-
void VisitedStates::prune()
{
- while (states_.size() > (std::size_t) _sg_mc_visited) {
+ 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<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
}
}
-/** \brief Checks whether a given state has already been visited by the algorithm.
- */
+/** @brief Checks whether a given state has already been visited by the algorithm. */
std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snpashots)
{
if (compare_snpashots)
for (auto i = range.first; i != range.second; ++i) {
auto& visited_state = *i;
- if (snapshot_compare(visited_state.get(), new_state.get()) == 0) {
+ if (snapshot_equal(visited_state->system_state.get(), new_state->system_state.get())) {
// The state has been visited:
std::unique_ptr<simgrid::mc::VisitedState> old_state =
