X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/732fb7b7871f8a5e0f3994c068bb613065d7cd63..07693a202e6ef29154c199d5e8d6aeb512669728:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 6ae7e103aa..86ee54fe2c 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; } @@ -317,7 +314,7 @@ void CommunicationDeterminismChecker::prepare() 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); + initial_state->mark_todo(actor->get_pid()); } stack_.push_back(std::move(initial_state)); @@ -345,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()); @@ -382,7 +379,8 @@ void CommunicationDeterminismChecker::restoreState() } } -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) { @@ -410,7 +408,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 */ @@ -423,19 +420,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); + req_str = api::get().request_get_dot_output(aid, req_num); api::get().mc_inc_executed_trans(); @@ -472,7 +470,7 @@ void CommunicationDeterminismChecker::real_run() 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); + next_state->mark_todo(actor->get_pid()); } if (dot_output != nullptr) @@ -534,7 +532,7 @@ void CommunicationDeterminismChecker::run() this->real_run(); } -Checker* createCommunicationDeterminismChecker(Session* session) +Checker* create_communication_determinism_checker(Session* session) { return new CommunicationDeterminismChecker(session); }