-/* Copyright (c) 2011-2020. 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 <sys/wait.h>
#include <memory>
#include <boost/range/algorithm.hpp>
+#include "src/mc/api.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
/** @brief Save the current state */
VisitedState::VisitedState(unsigned long state_number) : 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->heap_bytes_used = Api::get().get_remote_heap_bytes();
+ this->actors_count = Api::get().get_actors().size();
this->system_state = std::make_shared<simgrid::mc::Snapshot>(state_number);
}
std::unique_ptr<simgrid::mc::VisitedState>
VisitedStates::addVisitedState(unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snapshots)
{
- std::unique_ptr<simgrid::mc::VisitedState> new_state =
- std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState(state_number));
+ auto new_state = std::make_unique<simgrid::mc::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(),
+ XBT_DEBUG("Snapshot %p of visited state %ld (exploration stack state %ld)", new_state->system_state.get(),
new_state->num, graph_state->num_);
- auto range =
- boost::range::equal_range(states_, new_state.get(), simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap());
+ auto range = boost::range::equal_range(states_, new_state.get(), Api::get().compare_pair());
if (compare_snapshots)
for (auto i = range.first; i != range.second; ++i) {
auto& visited_state = *i;
- if (snapshot_equal(visited_state->system_state.get(), new_state->system_state.get())) {
+ if (Api::get().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 =
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);
+ XBT_DEBUG("State %ld already visited ! (equal to state %ld)", 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());
+ XBT_DEBUG("Insert new visited state %ld (total : %lu)", new_state->num, (unsigned long)states_.size());
states_.insert(range.first, std::move(new_state));
this->prune();
return nullptr;