/* 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 <cassert>
-#include <cstdio>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
+#include "src/mc/Session.hpp"
#include "src/mc/Transition.hpp"
#include "src/mc/VisitedState.hpp"
#include "src/mc/checker/SafetyChecker.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_record.hpp"
-#include "src/mc/mc_request.hpp"
#include "src/xbt/mmalloc/mmprivate.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
+
+#include <cassert>
+#include <cstdio>
+
+#include <memory>
+#include <string>
+#include <vector>
using api = simgrid::mc::Api;
XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***");
XBT_INFO("******************************************");
XBT_INFO("Counter-example execution trace:");
- auto checker = api::get().mc_get_checker();
- for (auto const& s : checker->get_textual_trace())
+ for (auto const& s : get_textual_trace())
XBT_INFO(" %s", s.c_str());
api::get().dump_record_path();
api::get().log_state();
// 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 reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\");
+ 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 no more processes 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;
}
auto actors = api::get().get_actors();
for (auto& remoteActor : actors) {
auto actor = remoteActor.copy.get_buffer();
- if (api::get().actor_is_enabled(actor->get_pid())) {
+ if (get_session().actor_is_enabled(actor->get_pid())) {
next_state->mark_todo(actor);
if (reductionMode_ == ReductionMode::dpor)
break; // With DPOR, we take the first enabled transition
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_);
- if (call == simix::Simcall::MUTEX_LOCK)
- xbt_die("Mutex is currently not supported with DPOR, use --cfg=model-check/reduction:none");
-
+ 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_)) {
if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
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_);
}
}
}
return;
}
- /* Restore the initial state */
- api::get().restore_initial_state();
+ get_session().restore_initial_state();
/* Traverse the stack from the state at position start and re-execute the transitions */
for (std::unique_ptr<State> const& state : stack_) {
}
}
-SafetyChecker::SafetyChecker() : Checker()
+SafetyChecker::SafetyChecker(Session* session) : Checker(session)
{
reductionMode_ = reduction_mode;
if (_sg_mc_termination)
XBT_INFO("Check a safety property. Reduction is: %s.",
(reductionMode_ == ReductionMode::none ? "none"
: (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown")));
-
- api::get().session_initialize();
+
+ get_session().take_initial_snapshot();
XBT_DEBUG("Starting the safety algorithm");
/* Get an enabled actor and insert it in the interleave set of the initial state */
auto actors = api::get().get_actors();
for (auto& actor : actors)
- if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) {
+ if (get_session().actor_is_enabled(actor.copy.get_buffer()->get_pid())) {
initial_state->mark_todo(actor.copy.get_buffer());
if (reductionMode_ != ReductionMode::none)
break;
stack_.push_back(std::move(initial_state));
}
-Checker* createSafetyChecker()
+Checker* create_safety_checker(Session* session)
{
- return new SafetyChecker();
+ return new SafetyChecker(session);
}
} // namespace mc
