-/* Copyright (c) 2011-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2011-2023. 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. */
namespace simgrid::mc {
VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t prop_state,
- std::shared_ptr<const std::vector<int>> atomic_propositions, std::shared_ptr<State> app_state)
+ std::shared_ptr<const std::vector<int>> atomic_propositions, std::shared_ptr<State> app_state,
+ RemoteApp& remote_app)
: num(pair_num), prop_state_(prop_state)
{
+ auto& memory = mc_model_checker->get_remote_process_memory();
this->app_state_ = std::move(app_state);
if (not this->app_state_->get_system_state())
- this->app_state_->set_system_state(std::make_shared<Snapshot>(pair_num));
- this->heap_bytes_used = Api::get().get_remote_heap_bytes();
+ this->app_state_->set_system_state(std::make_shared<Snapshot>(pair_num, remote_app.get_page_store(), memory));
+ this->heap_bytes_used = memory.get_remote_heap_bytes();
this->actor_count_ = app_state_->get_actor_count();
this->other_num = -1;
this->atomic_propositions = std::move(atomic_propositions);
std::shared_ptr<VisitedPair> LivenessChecker::insert_acceptance_pair(simgrid::mc::Pair* pair)
{
- auto new_pair =
- std::make_shared<VisitedPair>(pair->num, pair->prop_state_, pair->atomic_propositions, pair->app_state_);
+ auto new_pair = std::make_shared<VisitedPair>(pair->num, pair->prop_state_, pair->atomic_propositions,
+ pair->app_state_, get_remote_app());
- auto [res_begin, res_end] = boost::range::equal_range(acceptance_pairs_, new_pair.get(), Api::get().compare_pair());
+ auto [res_begin,
+ res_end] = boost::range::equal_range(acceptance_pairs_, new_pair.get(), [](auto const& a, auto const& b) {
+ return std::make_pair(a->actor_count_, a->heap_bytes_used) < std::make_pair(b->actor_count_, b->heap_bytes_used);
+ });
if (pair->search_cycle)
for (auto i = res_begin; i != res_end; ++i) {
std::shared_ptr<simgrid::mc::VisitedPair> const& pair_test = *i;
if (xbt_automaton_state_compare(pair_test->prop_state_, new_pair->prop_state_) != 0 ||
*(pair_test->atomic_propositions) != *(new_pair->atomic_propositions) ||
- not Api::get().snapshot_equal(pair_test->app_state_->get_system_state(),
- new_pair->app_state_->get_system_state()))
+ (*pair_test->app_state_->get_system_state() != *new_pair->app_state_->get_system_state()))
continue;
XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
exploration_stack_.pop_back();
- mc_model_checker->dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, pair_test->num,
- this->previous_request_.c_str());
+ dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, pair_test->num, this->previous_request_.c_str());
return nullptr;
}
if (_sg_mc_checkpoint > 0) {
const Pair* pair = exploration_stack_.back().get();
if (const auto* system_state = pair->app_state_->get_system_state()) {
- system_state->restore(&get_remote_app().get_remote_process());
+ system_state->restore(get_remote_app().get_remote_process_memory());
return;
}
}
return -1;
if (visited_pair == nullptr)
- visited_pair =
- std::make_shared<VisitedPair>(pair->num, pair->prop_state_, pair->atomic_propositions, pair->app_state_);
+ visited_pair = std::make_shared<VisitedPair>(pair->num, pair->prop_state_, pair->atomic_propositions,
+ pair->app_state_, get_remote_app());
- auto [range_begin, range_end] =
- boost::range::equal_range(visited_pairs_, visited_pair.get(), Api::get().compare_pair());
+ auto [range_begin,
+ range_end] = boost::range::equal_range(visited_pairs_, visited_pair.get(), [](auto const& a, auto const& b) {
+ return std::make_pair(a->actor_count_, a->heap_bytes_used) < std::make_pair(b->actor_count_, b->heap_bytes_used);
+ });
for (auto i = range_begin; i != range_end; ++i) {
const VisitedPair* pair_test = i->get();
if (xbt_automaton_state_compare(pair_test->prop_state_, visited_pair->prop_state_) != 0 ||
*(pair_test->atomic_propositions) != *(visited_pair->atomic_propositions) ||
- not Api::get().snapshot_equal(pair_test->app_state_->get_system_state(),
- visited_pair->app_state_->get_system_state()))
+ (*pair_test->app_state_->get_system_state() != *visited_pair->app_state_->get_system_state()))
continue;
if (pair_test->other_num == -1)
visited_pair->other_num = pair_test->num;
LivenessChecker::LivenessChecker(const std::vector<char*>& args) : Exploration(args) {}
LivenessChecker::~LivenessChecker()
{
- if (property_automaton_ != nullptr)
- xbt_automaton_free(property_automaton_);
+ xbt_automaton_free(property_automaton_);
}
xbt_automaton_t LivenessChecker::property_automaton_ = nullptr;
-void LivenessChecker::automaton_load(const char* file)
+void LivenessChecker::automaton_load(const char* file) const
{
if (property_automaton_ == nullptr)
property_automaton_ = xbt_automaton_new();
const xbt_automaton_transition* transition = xbt_dynar_get_as(dynar, index, xbt_automaton_transition_t);
return transition->dst;
}
-void LivenessChecker::automaton_register_symbol(RemoteProcess& remote_process, const char* name, RemotePtr<int> address)
+void LivenessChecker::automaton_register_symbol(RemoteProcessMemory const& remote_process, const char* name,
+ RemotePtr<int> address)
{
if (property_automaton_ == nullptr)
property_automaton_ = xbt_automaton_new();
XBT_INFO("Counter-example that violates formula:");
for (auto const& s : this->get_textual_trace())
XBT_INFO(" %s", s.c_str());
- XBT_INFO("Path = %s", get_record_trace().to_string().c_str());
+ XBT_INFO("You can debug the problem (and see the whole details) by rerunning out of simgrid-mc with "
+ "--cfg=model-check/replay:'%s'",
+ get_record_trace().to_string().c_str());
log_state();
XBT_INFO("Counter-example depth: %zu", depth);
}
if (not current_pair->exploration_started) {
int visited_num = this->insert_visited_pair(reached_pair, current_pair.get());
if (visited_num != -1) {
- mc_model_checker->dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, visited_num,
- this->previous_request_.c_str());
- mc_model_checker->dot_output_flush();
+ dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, visited_num, this->previous_request_.c_str());
XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
current_pair->requests = 0;
}
}
- current_pair->app_state_->execute_next(current_pair->app_state_->next_transition());
+ current_pair->app_state_->execute_next(current_pair->app_state_->next_transition(), get_remote_app());
XBT_DEBUG("Execute: %s", current_pair->app_state_->get_transition()->to_string().c_str());
/* Update the dot output */
if (this->previous_pair_ != 0 && this->previous_pair_ != current_pair->num) {
- mc_model_checker->dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, current_pair->num,
- this->previous_request_.c_str());
+ dot_output("\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, current_pair->num, this->previous_request_.c_str());
this->previous_request_.clear();
}
this->previous_pair_ = current_pair->num;
this->previous_request_ = current_pair->app_state_->get_transition()->dot_string();
if (current_pair->search_cycle)
- mc_model_checker->dot_output("%d [shape=doublecircle];\n", current_pair->num);
- mc_model_checker->dot_output_flush();
+ dot_output("%d [shape=doublecircle];\n", current_pair->num);
if (not current_pair->exploration_started)
visited_pairs_count_++;
