X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67ba03bf0dd5b4f21696e46e42e25c2404dc2456..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 5751271254..4f6b149c47 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2021. 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. */ @@ -13,7 +13,6 @@ #include #include -#include "src/mc/Session.hpp" #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/SafetyChecker.hpp" @@ -23,7 +22,6 @@ #include "src/mc/mc_record.hpp" #include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" -#include "src/mc/mc_api.hpp" #include "src/xbt/mmalloc/mmprivate.h" @@ -37,16 +35,17 @@ namespace mc { void SafetyChecker::check_non_termination(const State* current_state) { for (auto state = stack_.rbegin(); state != stack_.rend(); ++state) - if (snapshot_equal((*state)->system_state_.get(), current_state->system_state_.get())) { + if (mcapi::get().snapshot_equal((*state)->system_state_.get(), current_state->system_state_.get())) { XBT_INFO("Non-progressive cycle: state %d -> state %d", (*state)->num_, current_state->num_); XBT_INFO("******************************************"); XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); XBT_INFO("******************************************"); XBT_INFO("Counter-example execution trace:"); - for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) + auto checker = mcapi::get().mc_get_checker(); + for (auto const& s : checker->get_textual_trace()) XBT_INFO(" %s", s.c_str()); - dumpRecordPath(); - session->log_state(); + mcapi::get().dump_record_path(); + mcapi::get().log_state(); throw TerminationError(); } @@ -66,8 +65,7 @@ std::vector SafetyChecker::get_textual_trace() // override for (auto const& state : stack_) { int value = state->transition_.argument_; smx_simcall_t req = &state->executed_req_; - if (req) - trace.push_back(mcapi::get().request_to_string(req, value, RequestType::executed)); + trace.push_back(mcapi::get().request_to_string(req, value, RequestType::executed)); } return trace; } @@ -93,7 +91,7 @@ void SafetyChecker::run() XBT_VERB("Exploration depth=%zu (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num_, state->interleave_size()); - mc_model_checker->visited_states++; + mcapi::get().mc_inc_visited_states(); // Backtrack if we reached the maximum depth if (stack_.size() > (std::size_t)_sg_mc_max_depth) { @@ -114,7 +112,7 @@ void SafetyChecker::run() // Search an enabled transition in the current state; backtrack if the interleave set is empty // get_request also sets state.transition to be the one corresponding to the returned req - smx_simcall_t req = MC_state_choose_request(state); + smx_simcall_t req = mcapi::get().mc_state_choose_request(state); // req is now the transition of the process that was selected to be executed if (req == nullptr) { @@ -126,16 +124,16 @@ void SafetyChecker::run() // If there are processes to interleave and the maximum depth has not been // reached then perform one step of the exploration algorithm. - XBT_DEBUG("Execute: %s", request_to_string(req, state->transition_.argument_, RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", mcapi::get().request_to_string(req, state->transition_.argument_, RequestType::simix).c_str()); std::string req_str; if (dot_output != nullptr) - req_str = request_get_dot_output(req, state->transition_.argument_); + req_str = mcapi::get().request_get_dot_output(req, state->transition_.argument_); - mc_model_checker->executed_transitions++; + mcapi::get().mc_inc_executed_trans(); /* Actually answer the request: let execute the selected request (MCed does one step) */ - this->get_session().execute(state->transition_); + mcapi::get().execute(state->transition_); /* Create the new expanded state (copy the state of MCed into our MCer data) */ ++expanded_states_count_; @@ -151,9 +149,10 @@ void SafetyChecker::run() /* 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 */ - for (auto& remoteActor : mc_model_checker->get_remote_simulation().actors()) { + auto actors = mcapi::get().get_actors(); + for (auto& remoteActor : actors) { auto actor = remoteActor.copy.get_buffer(); - if (actor_is_enabled(actor)) { + if (mcapi::get().actor_is_enabled(actor->get_pid())) { next_state->add_interleaving_set(actor); if (reductionMode_ == ReductionMode::dpor) break; // With DPOR, we take the first enabled transition @@ -172,7 +171,7 @@ void SafetyChecker::run() } XBT_INFO("No property violation found."); - session->log_state(); + mcapi::get().log_state(); } void SafetyChecker::backtrack() @@ -195,10 +194,10 @@ void SafetyChecker::backtrack() stack_.pop_back(); if (reductionMode_ == ReductionMode::dpor) { smx_simcall_t req = &state->internal_req_; - if (req->call_ == SIMCALL_MUTEX_LOCK || req->call_ == SIMCALL_MUTEX_TRYLOCK) + if (req->call_ == simix::Simcall::MUTEX_LOCK || req->call_ == simix::Simcall::MUTEX_TRYLOCK) xbt_die("Mutex is currently not supported with DPOR, use --cfg=model-check/reduction:none"); - const kernel::actor::ActorImpl* issuer = mcapi::get().mc_smx_simcall_get_issuer(req); + const kernel::actor::ActorImpl* issuer = mcapi::get().simcall_get_issuer(req); for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { State* prev_state = i->get(); if (mcapi::get().request_depend(req, &prev_state->internal_req_)) { @@ -220,14 +219,14 @@ void SafetyChecker::backtrack() XBT_DEBUG("Process %p is in done set", req->issuer_); break; } else if (req->issuer_ == prev_state->internal_req_.issuer_) { - XBT_DEBUG("Simcall %s and %s with same issuer", mcapi::get().simix_simcall_name(req->call_), - mcapi::get().simix_simcall_name(prev_state->internal_req_.call_)); + XBT_DEBUG("Simcall %s and %s with same issuer", mcapi::get().simcall_get_name(req->call_), + mcapi::get().simcall_get_name(prev_state->internal_req_.call_)); break; } else { - const kernel::actor::ActorImpl* previous_issuer = mcapi::get().mc_smx_simcall_get_issuer(&prev_state->internal_req_); + const kernel::actor::ActorImpl* previous_issuer = mcapi::get().simcall_get_issuer(&prev_state->internal_req_); XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent", - mcapi::get().simix_simcall_name(req->call_), issuer->get_pid(), state->num_, - mcapi::get().simix_simcall_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); + mcapi::get().simcall_get_name(req->call_), issuer->get_pid(), state->num_, + mcapi::get().simcall_get_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); } } } @@ -250,12 +249,12 @@ void SafetyChecker::restore_state() /* Intermediate backtracking */ const State* last_state = stack_.back().get(); if (last_state->system_state_) { - last_state->system_state_->restore(&mcapi::get().mc_get_remote_simulation()); + mc_api::get().restore_state(last_state->system_state_); return; } /* Restore the initial state */ - mcapi::get().s_restore_initial_state(); + mcapi::get().restore_initial_state(); /* Traverse the stack from the state at position start and re-execute the transitions */ for (std::unique_ptr const& state : stack_) { @@ -268,7 +267,7 @@ void SafetyChecker::restore_state() } } -SafetyChecker::SafetyChecker(Session& s) : Checker(s) +SafetyChecker::SafetyChecker() : Checker() { reductionMode_ = reduction_mode; if (_sg_mc_termination) @@ -283,7 +282,7 @@ SafetyChecker::SafetyChecker(Session& s) : Checker(s) (reductionMode_ == ReductionMode::none ? "none" : (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown"))); - mcapi::get().s_initialize(); + mcapi::get().session_initialize(); XBT_DEBUG("Starting the safety algorithm"); @@ -305,9 +304,9 @@ SafetyChecker::SafetyChecker(Session& s) : Checker(s) stack_.push_back(std::move(initial_state)); } -Checker* createSafetyChecker(Session& s) +Checker* createSafetyChecker() { - return new SafetyChecker(s); + return new SafetyChecker(); } } // namespace mc