X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfb06b8c0625ebd2dd51304786fc4e36a2a0ae41..e9a884e745ad230410dde4af838d5727fd33edd0:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 29db357dd5..9c179abc9e 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-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. */ @@ -9,18 +9,10 @@ #include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_request.hpp" -#include "src/mc/mc_smx.hpp" -#include "src/mc/mc_api.hpp" - -#if HAVE_SMPI -#include "smpi_request.hpp" -#endif #include -using simgrid::mc::remote; -using mcapi = simgrid::mc::mc_api; +using api = simgrid::mc::Api; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection"); @@ -31,103 +23,115 @@ std::vector> incomplete_communic /********** Static functions ***********/ -static e_mc_comm_pattern_difference_t compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1, - const simgrid::mc::PatternCommunication* comm2) +static simgrid::mc::CommPatternDifference compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1, + const simgrid::mc::PatternCommunication* comm2) { - if(comm1->type != comm2->type) - return TYPE_DIFF; + using simgrid::mc::CommPatternDifference; + if (comm1->type != comm2->type) + return CommPatternDifference::TYPE; if (comm1->rdv != comm2->rdv) - return RDV_DIFF; + return CommPatternDifference::RDV; if (comm1->src_proc != comm2->src_proc) - return SRC_PROC_DIFF; + return CommPatternDifference::SRC_PROC; if (comm1->dst_proc != comm2->dst_proc) - return DST_PROC_DIFF; + return CommPatternDifference::DST_PROC; if (comm1->tag != comm2->tag) - return TAG_DIFF; + return CommPatternDifference::TAG; if (comm1->data.size() != comm2->data.size()) - return DATA_SIZE_DIFF; + return CommPatternDifference::DATA_SIZE; if (comm1->data != comm2->data) - return DATA_DIFF; - return NONE_DIFF; + return CommPatternDifference::DATA; + return CommPatternDifference::NONE; +} + +static void patterns_copy(std::vector& dest, + std::vector const& source) +{ + dest.clear(); + for (simgrid::mc::PatternCommunication const& comm : source) { + auto* copy_comm = new simgrid::mc::PatternCommunication(comm.dup()); + dest.push_back(copy_comm); + } +} + +static void restore_communications_pattern(simgrid::mc::State* state) +{ + for (size_t i = 0; i < initial_communications_pattern.size(); i++) + initial_communications_pattern[i].index_comm = state->communication_indices_[i]; + + const unsigned long maxpid = api::get().get_maxpid(); + for (unsigned long i = 0; i < maxpid; i++) + patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]); } -static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int process, +static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, aid_t process, const simgrid::mc::PatternCommunication* comm, unsigned int cursor) { char* type; char* res; if (comm->type == simgrid::mc::PatternCommunicationType::send) - type = bprintf("The send communications pattern of the process %d is different!", process - 1); + type = bprintf("The send communications pattern of the process %ld is different!", process - 1); else - type = bprintf("The recv communications pattern of the process %d is different!", process - 1); - - switch(diff) { - case TYPE_DIFF: - res = bprintf("%s Different type for communication #%u", type, cursor); - break; - case RDV_DIFF: - res = bprintf("%s Different rdv for communication #%u", type, cursor); - break; - case TAG_DIFF: - res = bprintf("%s Different tag for communication #%u", type, cursor); - break; - case SRC_PROC_DIFF: - res = bprintf("%s Different source for communication #%u", type, cursor); - break; - case DST_PROC_DIFF: - res = bprintf("%s Different destination for communication #%u", type, cursor); - break; - case DATA_SIZE_DIFF: - res = bprintf("%s Different data size for communication #%u", type, cursor); - break; - case DATA_DIFF: - res = bprintf("%s Different data for communication #%u", type, cursor); - break; - default: - res = nullptr; - break; + type = bprintf("The recv communications pattern of the process %ld is different!", process - 1); + + using simgrid::mc::CommPatternDifference; + switch (diff) { + case CommPatternDifference::TYPE: + res = bprintf("%s Different type for communication #%u", type, cursor); + break; + case CommPatternDifference::RDV: + res = bprintf("%s Different rdv for communication #%u", type, cursor); + break; + case CommPatternDifference::TAG: + res = bprintf("%s Different tag for communication #%u", type, cursor); + break; + case CommPatternDifference::SRC_PROC: + res = bprintf("%s Different source for communication #%u", type, cursor); + break; + case CommPatternDifference::DST_PROC: + res = bprintf("%s Different destination for communication #%u", type, cursor); + break; + case CommPatternDifference::DATA_SIZE: + res = bprintf("%s Different data size for communication #%u", type, cursor); + break; + case CommPatternDifference::DATA: + res = bprintf("%s Different data for communication #%u", type, cursor); + break; + default: + res = nullptr; + break; } return res; } static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern, - simgrid::mc::RemotePtr comm_addr) + simgrid::mc::RemotePtr const& comm_addr) { - // HACK, type punning - simgrid::mc::Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr); - const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - - smx_actor_t src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get())); - smx_actor_t dst_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get())); + auto src_proc = api::get().get_src_actor(comm_addr); + auto dst_proc = api::get().get_dst_actor(comm_addr); comm_pattern->src_proc = src_proc->get_pid(); comm_pattern->dst_proc = dst_proc->get_pid(); - comm_pattern->src_host = MC_smx_actor_get_host_name(src_proc); - comm_pattern->dst_host = MC_smx_actor_get_host_name(dst_proc); - if (comm_pattern->data.empty() && comm->src_buff_ != nullptr) { - size_t buff_size; - mc_model_checker->get_remote_simulation().read(&buff_size, remote(comm->dst_buff_size_)); - comm_pattern->data.resize(buff_size); - mc_model_checker->get_remote_simulation().read_bytes(comm_pattern->data.data(), comm_pattern->data.size(), - remote(comm->src_buff_)); + comm_pattern->src_host = &api::get().get_actor_host_name(src_proc); + comm_pattern->dst_host = &api::get().get_actor_host_name(dst_proc); + + if (comm_pattern->data.empty()) { + comm_pattern->data = api::get().get_pattern_comm_data(comm_addr); } } namespace simgrid { namespace mc { -void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, const PatternCommunication* comm, +void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, const PatternCommunication* comm, int backtracking) { if (not backtracking) { - PatternCommunicationList& list = initial_communications_pattern[process]; - e_mc_comm_pattern_difference_t diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); + PatternCommunicationList& list = initial_communications_pattern[process]; + CommPatternDifference diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); - if (diff != NONE_DIFF) { + if (diff != CommPatternDifference::NONE) { if (comm->type == PatternCommunicationType::send) { this->send_deterministic = false; if (this->send_diff != nullptr) @@ -146,8 +150,8 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, co XBT_INFO("%s", this->send_diff); xbt_free(this->send_diff); this->send_diff = nullptr; - mc::session->log_state(); - mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); + api::get().log_state(); + api::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } else if (_sg_mc_comms_determinism && (not this->send_deterministic && not this->recv_deterministic)) { XBT_INFO("****************************************************"); XBT_INFO("***** Non-deterministic communications pattern *****"); @@ -162,8 +166,8 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, co xbt_free(this->recv_diff); this->recv_diff = nullptr; } - mc::session->log_state(); - mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); + api::get().log_state(); + api::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } } @@ -171,46 +175,31 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, co /********** Non Static functions ***********/ -void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_mc_call_type_t call_type, - int backtracking) +void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking) { - const smx_actor_t issuer = MC_smx_simcall_get_issuer(request); + const smx_actor_t issuer = api::get().simcall_get_issuer(request); const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; const std::vector& incomplete_pattern = incomplete_communications_pattern[issuer->get_pid()]; auto pattern = std::make_unique(); pattern->index = initial_pattern.index_comm + incomplete_pattern.size(); - if (call_type == MC_CALL_TYPE_SEND) { + if (call_type == CallType::SEND) { /* Create comm pattern */ pattern->type = PatternCommunicationType::send; - pattern->comm_addr = static_cast(simcall_comm_isend__getraw__result(request)); - - Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, remote(pattern->comm_addr)); - const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); - - char* remote_name = mc_model_checker->get_remote_simulation().read(RemotePtr( - (uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->name_ : &synchro->mbox_cpy->name_))); - pattern->rdv = mc_model_checker->get_remote_simulation().read_string(RemotePtr(remote_name)); - pattern->src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid(); - pattern->src_host = MC_smx_actor_get_host_name(issuer); + pattern->comm_addr = api::get().get_comm_isend_raw_addr(request); + pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr); + pattern->src_proc = api::get().get_pattern_comm_src_proc(pattern->comm_addr); + pattern->src_host = &api::get().get_actor_host_name(issuer); #if HAVE_SMPI - simgrid::smpi::Request mpi_request; - mc_model_checker->get_remote_simulation().read( - &mpi_request, remote(static_cast(simcall_comm_isend__get__data(request)))); - pattern->tag = mpi_request.tag(); + pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND); #endif + pattern->data = api::get().get_pattern_comm_data(pattern->comm_addr); - if (synchro->src_buff_ != nullptr) { - pattern->data.resize(synchro->src_buff_size_); - mc_model_checker->get_remote_simulation().read_bytes(pattern->data.data(), pattern->data.size(), - remote(synchro->src_buff_)); - } #if HAVE_SMPI - if(mpi_request.detached()){ + auto send_detached = api::get().check_send_request_detached(request); + if (send_detached) { if (this->initial_communications_pattern_done) { /* Evaluate comm determinism */ this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking); @@ -222,50 +211,37 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ return; } #endif - } else if (call_type == MC_CALL_TYPE_RECV) { - pattern->type = PatternCommunicationType::receive; - pattern->comm_addr = static_cast(simcall_comm_irecv__getraw__result(request)); + } else if (call_type == CallType::RECV) { + pattern->type = PatternCommunicationType::receive; + pattern->comm_addr = api::get().get_comm_isend_raw_addr(request); #if HAVE_SMPI - smpi::Request mpi_request; - mc_model_checker->get_remote_simulation().read( - &mpi_request, remote(static_cast(simcall_comm_irecv__get__data(request)))); - pattern->tag = mpi_request.tag(); + pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_IRECV); #endif - - Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, remote(pattern->comm_addr)); - const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - - char* remote_name; - mc_model_checker->get_remote_simulation().read( - &remote_name, remote(comm->get_mailbox() ? &xbt::string::to_string_data(comm->get_mailbox()->name_).data - : &xbt::string::to_string_data(comm->mbox_cpy->name_).data)); - pattern->rdv = mc_model_checker->get_remote_simulation().read_string(RemotePtr(remote_name)); - pattern->dst_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->dst_actor_.get()))->get_pid(); - pattern->dst_host = MC_smx_actor_get_host_name(issuer); + pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr); + pattern->dst_proc = api::get().get_pattern_comm_dst_proc(pattern->comm_addr); + pattern->dst_host = &api::get().get_actor_host_name(issuer); } else - xbt_die("Unexpected call_type %i", (int) call_type); + xbt_die("Unexpected call_type %i", (int)call_type); XBT_DEBUG("Insert incomplete comm pattern %p for process %ld", pattern.get(), issuer->get_pid()); incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr comm_addr, - unsigned int issuer, int backtracking) +void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr const& comm_addr, aid_t issuer, + int backtracking) { /* Complete comm pattern */ std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; auto current_comm_pattern = std::find_if(begin(incomplete_pattern), end(incomplete_pattern), - [&comm_addr](const PatternCommunication* comm) { return remote(comm->comm_addr) == comm_addr; }); + [&comm_addr](const PatternCommunication* comm) { return (comm->comm_addr == comm_addr); }); if (current_comm_pattern == std::end(incomplete_pattern)) xbt_die("Corresponding communication not found!"); update_comm_pattern(*current_comm_pattern, comm_addr); std::unique_ptr comm_pattern(*current_comm_pattern); - XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %zd", issuer, + XBT_DEBUG("Remove incomplete comm pattern for process %ld at cursor %zd", issuer, std::distance(begin(incomplete_pattern), current_comm_pattern)); incomplete_pattern.erase(current_comm_pattern); @@ -279,9 +255,7 @@ void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr CommunicationDeterminismChecker::get_textual_trace() // std::vector trace; for (auto const& state : stack_) { smx_simcall_t req = &state->executed_req_; - if (req) - trace.push_back(request_to_string(req, state->transition_.argument_, RequestType::executed)); + trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_)); } return trace; } @@ -321,8 +294,8 @@ void CommunicationDeterminismChecker::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", api::get().mc_get_visited_states()); + XBT_INFO("Executed transitions = %lu", api::get().mc_get_executed_trans()); XBT_INFO("Send-deterministic : %s", this->send_deterministic ? "Yes" : "No"); if (_sg_mc_comms_determinism) XBT_INFO("Recv-deterministic : %s", this->recv_deterministic ? "Yes" : "No"); @@ -330,7 +303,7 @@ void CommunicationDeterminismChecker::log_state() // override void CommunicationDeterminismChecker::prepare() { - const int maxpid = mcapi::get().get_maxpid(); + const unsigned long maxpid = api::get().get_maxpid(); initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); @@ -340,18 +313,20 @@ void CommunicationDeterminismChecker::prepare() XBT_DEBUG("********* Start communication determinism verification *********"); - /* Get an enabled actor and insert it in the interleave set of the initial state */ - auto actors = mcapi::get().get_actors(); - for (auto& actor : actors) - if (mcapi::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) - initial_state->add_interleaving_set(actor.copy.get_buffer()); + /* Add all enabled actors to the interleave set of the initial state */ + for (auto& act : api::get().get_actors()) { + auto actor = act.copy.get_buffer(); + if (api::get().actor_is_enabled(actor->get_pid())) + initial_state->mark_todo(actor); + } stack_.push_back(std::move(initial_state)); } static inline bool all_communications_are_finished() { - for (size_t current_actor = 1; current_actor < MC_smx_get_maxpid(); current_actor++) { + const unsigned long maxpid = api::get().get_maxpid(); + for (size_t current_actor = 1; current_actor < maxpid; current_actor++) { if (not incomplete_communications_pattern[current_actor].empty()) { XBT_DEBUG("Some communications are not finished, cannot stop the exploration! State not visited."); return false; @@ -365,18 +340,17 @@ void CommunicationDeterminismChecker::restoreState() /* Intermediate backtracking */ State* last_state = stack_.back().get(); if (last_state->system_state_) { - last_state->system_state_->restore(&mc_model_checker->get_remote_simulation()); - MC_restore_communications_pattern(last_state); + api::get().restore_state(last_state->system_state_); + restore_communications_pattern(last_state); return; } - /* Restore the initial state */ - mc::session->restore_initial_state(); + session->restore_initial_state(); - unsigned n = MC_smx_get_maxpid(); - assert(n == incomplete_communications_pattern.size()); - assert(n == initial_communications_pattern.size()); - for (unsigned j=0; j < n ; j++) { + const unsigned long maxpid = api::get().get_maxpid(); + assert(maxpid == incomplete_communications_pattern.size()); + assert(maxpid == initial_communications_pattern.size()); + for (unsigned long j = 0; j < maxpid; j++) { incomplete_communications_pattern[j].clear(); initial_communications_pattern[j].index_comm = 0; } @@ -386,32 +360,57 @@ void CommunicationDeterminismChecker::restoreState() if (state == stack_.back()) break; - int req_num = state->transition_.argument_; + int req_num = state->transition_.times_considered_; const s_smx_simcall* saved_req = &state->executed_req_; xbt_assert(saved_req); /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ - const smx_actor_t issuer = MC_smx_simcall_get_issuer(saved_req); + const smx_actor_t issuer = api::get().simcall_get_issuer(saved_req); smx_simcall_t req = &issuer->simcall_; /* TODO : handle test and testany simcalls */ - e_mc_call_type_t call = MC_get_call_type(req); - mc_model_checker->handle_simcall(state->transition_); - MC_handle_comm_pattern(call, req, req_num, 1); - mc_model_checker->wait_for_requests(); + CallType call = MC_get_call_type(req); + api::get().handle_simcall(state->transition_); + handle_comm_pattern(call, req, req_num, 1); + api::get().mc_wait_for_requests(); /* Update statistics */ - mc_model_checker->visited_states++; - mc_model_checker->executed_transitions++; + api::get().mc_inc_visited_states(); + api::get().mc_inc_executed_trans(); + } +} + +void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, int backtracking) +{ + using simgrid::mc::CallType; + switch(call_type) { + case CallType::NONE: + break; + case CallType::SEND: + case CallType::RECV: + get_comm_pattern(req, call_type, backtracking); + break; + case CallType::WAIT: + case CallType::WAITANY: { + RemotePtr comm_addr; + if (call_type == CallType::WAIT) + comm_addr = remote(simcall_comm_wait__getraw__comm(req)); + else + comm_addr = api::get().get_comm_waitany_raw_addr(req, value); + auto simcall_issuer = api::get().simcall_get_issuer(req); + complete_comm_pattern(comm_addr, simcall_issuer->get_pid(), backtracking); + } break; + default: + xbt_die("Unexpected call type %i", (int)call_type); } } void CommunicationDeterminismChecker::real_run() { std::unique_ptr visited_state = nullptr; - smx_simcall_t req = nullptr; + smx_simcall_t req = nullptr; while (not stack_.empty()) { /* Get current state */ @@ -419,40 +418,40 @@ void CommunicationDeterminismChecker::real_run() XBT_DEBUG("**************************************************"); XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_, - cur_state->interleave_size()); + cur_state->count_todo()); /* Update statistics */ - mc_model_checker->visited_states++; + api::get().mc_inc_visited_states(); if (stack_.size() <= (std::size_t)_sg_mc_max_depth) - req = mcapi::get().mc_state_choose_request(cur_state); + req = api::get().mc_state_choose_request(cur_state); else req = nullptr; if (req != nullptr && visited_state == nullptr) { - int req_num = cur_state->transition_.argument_; + int req_num = cur_state->transition_.times_considered_; - XBT_DEBUG("Execute: %s", request_to_string(req, req_num, RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num).c_str()); std::string req_str; if (dot_output != nullptr) - req_str = request_get_dot_output(req, req_num); + req_str = api::get().request_get_dot_output(req, req_num); - mc_model_checker->executed_transitions++; + api::get().mc_inc_executed_trans(); /* TODO : handle test and testany simcalls */ - e_mc_call_type_t call = MC_CALL_TYPE_NONE; + CallType call = CallType::NONE; if (_sg_mc_comms_determinism || _sg_mc_send_determinism) call = MC_get_call_type(req); /* Answer the request */ - mc_model_checker->handle_simcall(cur_state->transition_); + api::get().handle_simcall(cur_state->transition_); /* After this call req is no longer useful */ - MC_handle_comm_pattern(call, req, req_num, 0); + handle_comm_pattern(call, req, req_num, 0); /* Wait for requests (schedules processes) */ - mc_model_checker->wait_for_requests(); + api::get().mc_wait_for_requests(); /* Create the new expanded state */ ++expanded_states_count_; @@ -469,10 +468,12 @@ void CommunicationDeterminismChecker::real_run() visited_state = nullptr; if (visited_state == nullptr) { - /* Get enabled actors and insert them in the interleave set of the next state */ - for (auto& actor : mc_model_checker->get_remote_simulation().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) - next_state->add_interleaving_set(actor.copy.get_buffer()); + /* Add all enabled actors to the interleave set of the next state */ + for (auto& act : api::get().get_actors()) { + auto actor = act.copy.get_buffer(); + if (api::get().actor_is_enabled(actor->get_pid())) + next_state->mark_todo(actor); + } if (dot_output != nullptr) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str()); @@ -483,11 +484,11 @@ void CommunicationDeterminismChecker::real_run() stack_.push_back(std::move(next_state)); } else { - if (stack_.size() > (std::size_t) _sg_mc_max_depth) + if (stack_.size() > (std::size_t)_sg_mc_max_depth) XBT_WARN("/!\\ Max depth reached! /!\\ "); else if (visited_state != nullptr) XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", - visited_state->original_num == -1 ? visited_state->num : visited_state->original_num); + visited_state->original_num == -1 ? visited_state->num : visited_state->original_num); else XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size()); @@ -499,16 +500,12 @@ void CommunicationDeterminismChecker::real_run() visited_state = nullptr; - /* Check for deadlocks */ - if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(); - throw simgrid::mc::DeadlockError(); - } + api::get().mc_check_deadlock(); while (not stack_.empty()) { std::unique_ptr state(std::move(stack_.back())); stack_.pop_back(); - if (state->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) { + if (state->count_todo() && stack_.size() < (std::size_t)_sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num_, stack_.size() + 1); stack_.push_back(std::move(state)); @@ -525,21 +522,21 @@ void CommunicationDeterminismChecker::real_run() } } - mc::session->log_state(); + api::get().log_state(); } void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - mcapi::get().s_initialize(); + get_session()->take_initial_snapshot(); this->prepare(); this->real_run(); } -Checker* createCommunicationDeterminismChecker(Session& s) +Checker* createCommunicationDeterminismChecker(Session* session) { - return new CommunicationDeterminismChecker(s); + return new CommunicationDeterminismChecker(session); } } // namespace mc