-/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-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. */
// Backtrack if we reached the maximum depth
if (stack_.size() > (std::size_t)_sg_mc_max_depth) {
- XBT_WARN("/!\\ Max depth reached ! /!\\ ");
+ if (reductionMode_ == ReductionMode::dpor) {
+ XBT_ERROR("/!\\ Max depth of %d reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\",
+ _sg_mc_max_depth.get());
+ XBT_ERROR("/!\\ If bad things happen, disable dpor with --cfg=model-check/reduction:none /!\\");
+ } else
+ XBT_WARN("/!\\ Max depth reached ! /!\\ ");
this->backtrack();
continue;
}
// req is now the transition of the process that was selected to be executed
if (req == nullptr) {
- XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size() + 1);
+ XBT_DEBUG("There remains %zu actors, but none to interleave (depth %zu).",
+ mc_model_checker->get_remote_process().actors().size(), stack_.size() + 1);
+ if (mc_model_checker->get_remote_process().actors().empty())
+ mc_model_checker->finalize_app();
this->backtrack();
continue;
}
api::get().mc_inc_executed_trans();
/* Actually answer the request: let execute the selected request (MCed does one step) */
- api::get().execute(state->transition_, &state->executed_req_);
+ RemotePtr<simgrid::kernel::actor::SimcallObserver> remote_observer =
+ api::get().execute(state->transition_, &state->executed_req_);
/* Create the new expanded state (copy the state of MCed into our MCer data) */
++expanded_states_count_;
auto next_state = std::make_unique<State>(expanded_states_count_);
+ next_state->remote_observer_ = remote_observer;
if (_sg_mc_termination)
this->check_non_termination(next_state.get());
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visited_state_ == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
- auto actors = api::get().get_actors();
+ auto actors = api::get().get_actors();
for (auto& remoteActor : actors) {
auto actor = remoteActor.copy.get_buffer();
if (get_session().actor_is_enabled(actor->get_pid())) {
std::unique_ptr<State> state = std::move(stack_.back());
stack_.pop_back();
if (reductionMode_ == ReductionMode::dpor) {
- auto call = state->executed_req_.call_;
- const kernel::actor::ActorImpl* issuer = api::get().simcall_get_issuer(&state->executed_req_);
+ kernel::actor::ActorImpl* issuer = api::get().simcall_get_issuer(&state->executed_req_);
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
State* prev_state = i->get();
if (state->executed_req_.issuer_ == prev_state->executed_req_.issuer_) {
- XBT_DEBUG("Simcall %s and %s with same issuer", SIMIX_simcall_name(call),
- SIMIX_simcall_name(prev_state->executed_req_.call_));
+ XBT_DEBUG("Simcall %s and %s with same issuer", SIMIX_simcall_name(state->executed_req_),
+ SIMIX_simcall_name(prev_state->executed_req_));
break;
- } else if (api::get().simcall_check_dependency(&state->internal_req_, &prev_state->internal_req_)) {
+ } else if (api::get().requests_are_dependent(state->remote_observer_, state->remote_observer_)) {
if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
XBT_DEBUG("Dependent Transitions:");
int value = prev_state->transition_.times_considered_;
if (not prev_state->actor_states_[issuer->get_pid()].is_done())
prev_state->mark_todo(issuer);
else
- XBT_DEBUG("Actor %s %ld is in done set", issuer->get_cname(), issuer->get_pid());
+ XBT_DEBUG("Actor %s %ld is in done set", api::get().get_actor_name(issuer).c_str(), issuer->get_pid());
break;
} else {
const kernel::actor::ActorImpl* previous_issuer = api::get().simcall_get_issuer(&prev_state->executed_req_);
XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent",
- SIMIX_simcall_name(call), issuer->get_pid(), state->num_,
- SIMIX_simcall_name(prev_state->executed_req_.call_), previous_issuer->get_pid(), prev_state->num_);
+ SIMIX_simcall_name(state->executed_req_), issuer->get_pid(), state->num_,
+ SIMIX_simcall_name(prev_state->executed_req_), previous_issuer->get_pid(), prev_state->num_);
}
}
}
auto initial_state = std::make_unique<State>(expanded_states_count_);
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Initial state");
/* Get an enabled actor and insert it in the interleave set of the initial state */
auto actors = api::get().get_actors();
+ XBT_DEBUG("Initial state. %zu actors to consider", actors.size());
for (auto& actor : actors)
if (get_session().actor_is_enabled(actor.copy.get_buffer()->get_pid())) {
initial_state->mark_todo(actor.copy.get_buffer());
- if (reductionMode_ != ReductionMode::none)
+ if (reductionMode_ == ReductionMode::dpor) {
+ XBT_DEBUG("Actor %ld is TODO, DPOR is ON so let's go for this one.", actor.copy.get_buffer()->get_pid());
break;
+ }
+ XBT_DEBUG("Actor %ld is TODO", actor.copy.get_buffer()->get_pid());
}
stack_.push_back(std::move(initial_state));
}
-Checker* createSafetyChecker(Session* session)
+Checker* create_safety_checker(Session* session)
{
return new SafetyChecker(session);
}
