X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98b49588ce51bb2a5b9c987119075faa3dedde44..0c1481a20458b4521a42758662e802277916cc47:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index a77bb189b1..4bd496a01b 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -37,16 +37,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().mc_dump_record_path(); + mcapi::get().s_log_state(); throw TerminationError(); } @@ -66,8 +67,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(request_to_string(req, value, RequestType::executed)); + trace.push_back(mcapi::get().request_to_string(req, value, RequestType::executed)); } return trace; } @@ -75,8 +75,8 @@ std::vector SafetyChecker::get_textual_trace() // override void SafetyChecker::log_state() // override { XBT_INFO("Expanded states = %lu", expanded_states_count_); - XBT_INFO("Visited states = %lu", mc_model_checker->visited_states); - XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions); + XBT_INFO("Visited states = %lu", mcapi::get().mc_get_visited_states()); + XBT_INFO("Executed transitions = %lu", mcapi::get().mc_get_executed_trans()); } void SafetyChecker::run() @@ -93,7 +93,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 +114,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 +126,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 +151,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().mc_get_remote_simulation().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 +173,7 @@ void SafetyChecker::run() } XBT_INFO("No property violation found."); - session->log_state(); + mcapi::get().s_log_state(); } void SafetyChecker::backtrack() @@ -180,8 +181,8 @@ void SafetyChecker::backtrack() stack_.pop_back(); /* Check for deadlocks */ - if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(); + if (mcapi::get().mc_check_deadlock()) { + mcapi::get().mc_show_deadlock(); throw DeadlockError(); } @@ -195,22 +196,22 @@ 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 = MC_smx_simcall_get_issuer(req); + const kernel::actor::ActorImpl* issuer = mcapi::get().mc_smx_simcall_get_issuer(req); for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { State* prev_state = i->get(); - if (request_depend(req, &prev_state->internal_req_)) { + if (mcapi::get().request_depend(req, &prev_state->internal_req_)) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { XBT_DEBUG("Dependent Transitions:"); int value = prev_state->transition_.argument_; smx_simcall_t prev_req = &prev_state->executed_req_; - XBT_DEBUG("%s (state=%d)", simgrid::mc::request_to_string(prev_req, value, RequestType::internal).c_str(), + XBT_DEBUG("%s (state=%d)", mcapi::get().request_to_string(prev_req, value, RequestType::internal).c_str(), prev_state->num_); value = state->transition_.argument_; prev_req = &state->executed_req_; - XBT_DEBUG("%s (state=%d)", simgrid::mc::request_to_string(prev_req, value, RequestType::executed).c_str(), + XBT_DEBUG("%s (state=%d)", mcapi::get().request_to_string(prev_req, value, RequestType::executed).c_str(), state->num_); } @@ -220,14 +221,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", SIMIX_simcall_name(req->call_), - SIMIX_simcall_name(prev_state->internal_req_.call_)); + 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_)); break; } else { - const kernel::actor::ActorImpl* previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req_); + const kernel::actor::ActorImpl* previous_issuer = mcapi::get().mc_smx_simcall_get_issuer(&prev_state->internal_req_); XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent", - SIMIX_simcall_name(req->call_), issuer->get_pid(), state->num_, - SIMIX_simcall_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); + 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_); } } }