X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ed8cddf1b2849cb3db5139684348bd64d47b09e..7702c2a72b669bc7f823f4513591a098a6b96800:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 05eede3028..a973d786c3 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-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. */ @@ -125,7 +125,7 @@ namespace simgrid { namespace mc { void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, const PatternCommunication* comm, - int backtracking) + bool backtracking) { if (not backtracking) { PatternCommunicationList& list = initial_communications_pattern[process]; @@ -175,7 +175,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, /********** Non Static functions ***********/ -void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking) +void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, bool backtracking) { const smx_actor_t issuer = api::get().simcall_get_issuer(request); const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; @@ -228,16 +228,15 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr const& comm_addr, aid_t issuer, - int backtracking) +void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr const& comm_addr, + aid_t issuer, bool 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 (comm->comm_addr == comm_addr); }); - if (current_comm_pattern == std::end(incomplete_pattern)) - xbt_die("Corresponding communication not found!"); + xbt_assert(current_comm_pattern != std::end(incomplete_pattern), "Corresponding communication not found!"); update_comm_pattern(*current_comm_pattern, comm_addr); std::unique_ptr comm_pattern(*current_comm_pattern); @@ -270,10 +269,8 @@ RecordTrace CommunicationDeterminismChecker::get_record_trace() // override std::vector CommunicationDeterminismChecker::get_textual_trace() // override { std::vector trace; - for (auto const& state : stack_) { - smx_simcall_t req = &state->executed_req_; - trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_)); - } + for (auto const& state : stack_) + trace.push_back(state->transition_.to_string()); return trace; } @@ -295,7 +292,7 @@ void CommunicationDeterminismChecker::log_state() // override } XBT_INFO("Expanded states = %lu", expanded_states_count_); XBT_INFO("Visited states = %lu", api::get().mc_get_visited_states()); - XBT_INFO("Executed transitions = %lu", api::get().mc_get_executed_trans()); + XBT_INFO("Executed transitions = %lu", Transition::get_executed_transitions()); 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"); @@ -313,11 +310,12 @@ 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 = api::get().get_actors(); - for (auto& actor : actors) - if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) - initial_state->mark_todo(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 (get_session().actor_is_enabled(actor->get_pid())) + initial_state->mark_todo(actor->get_pid()); + } stack_.push_back(std::move(initial_state)); } @@ -344,7 +342,7 @@ void CommunicationDeterminismChecker::restoreState() return; } - session->restore_initial_state(); + get_session().restore_initial_state(); const unsigned long maxpid = api::get().get_maxpid(); assert(maxpid == incomplete_communications_pattern.size()); @@ -377,11 +375,11 @@ void CommunicationDeterminismChecker::restoreState() /* Update statistics */ 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) +void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, + bool backtracking) { using simgrid::mc::CallType; switch(call_type) { @@ -409,7 +407,6 @@ void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType void CommunicationDeterminismChecker::real_run() { std::unique_ptr visited_state = nullptr; - smx_simcall_t req = nullptr; while (not stack_.empty()) { /* Get current state */ @@ -422,21 +419,20 @@ void CommunicationDeterminismChecker::real_run() /* Update statistics */ api::get().mc_inc_visited_states(); + bool found_transition = false; if (stack_.size() <= (std::size_t)_sg_mc_max_depth) - req = api::get().mc_state_choose_request(cur_state); - else - req = nullptr; + found_transition = api::get().mc_state_choose_request(cur_state); - if (req != nullptr && visited_state == nullptr) { + if (found_transition && visited_state == nullptr) { + aid_t aid = cur_state->transition_.aid_; int req_num = cur_state->transition_.times_considered_; + smx_simcall_t req = &cur_state->executed_req_; - XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num).c_str()); + XBT_DEBUG("Execute: %s", cur_state->transition_.to_string().c_str()); std::string req_str; if (dot_output != nullptr) - req_str = api::get().request_get_dot_output(req, req_num); - - api::get().mc_inc_executed_trans(); + req_str = api::get().request_get_dot_output(aid, req_num); /* TODO : handle test and testany simcalls */ CallType call = CallType::NONE; @@ -467,11 +463,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 */ - auto actors = api::get().get_actors(); - for (auto& actor : actors) - if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) - next_state->mark_todo(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 (get_session().actor_is_enabled(actor->get_pid())) + next_state->mark_todo(actor->get_pid()); + } if (dot_output != nullptr) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str()); @@ -526,13 +523,13 @@ void CommunicationDeterminismChecker::real_run() void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - get_session()->take_initial_snapshot(); + get_session().take_initial_snapshot(); this->prepare(); this->real_run(); } -Checker* createCommunicationDeterminismChecker(Session* session) +Checker* create_communication_determinism_checker(Session* session) { return new CommunicationDeterminismChecker(session); }