X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64267f7e36562e503aa04a2895707d74b37cc7a2..eaacbb174d19fe490b8243e2675e5e3b7cbb62de:/src/mc/mc_record.cpp diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index 6b9cd750c0..6f1d32f486 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2023. 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. */ @@ -23,16 +23,26 @@ namespace simgrid::mc { void RecordTrace::replay() const { simgrid::mc::execute_actors(); + auto* engine = kernel::EngineImpl::get_instance(); + + int frame_count = 1; + if (xbt_log_no_loc) + XBT_INFO("The backtrace of each transition will not be shown because of --log=no_loc"); + else + simgrid_mc_replay_show_backtraces = true; for (const simgrid::mc::Transition* transition : transitions_) { - kernel::actor::ActorImpl* actor = kernel::EngineImpl::get_instance()->get_actor_by_pid(transition->aid_); + kernel::actor::ActorImpl* actor = engine->get_actor_by_pid(transition->aid_); xbt_assert(actor != nullptr, "Unexpected actor (id:%ld).", transition->aid_); const kernel::actor::Simcall* simcall = &(actor->simcall_); xbt_assert(simgrid::mc::request_is_visible(simcall), "Simcall %s of actor %s is not visible.", simcall->get_cname(), actor->get_cname()); - XBT_DEBUG("Executing %ld$%i: %s", transition->aid_, transition->times_considered_, - simcall->observer_->to_string().c_str()); + XBT_INFO("***********************************************************************************"); + XBT_INFO("* Path chunk #%d '%ld/%i' Actor %s(pid:%ld): %s", frame_count++, transition->aid_, + transition->times_considered_, simcall->issuer_->get_cname(), simcall->issuer_->get_pid(), + simcall->observer_->to_string().c_str()); + XBT_INFO("***********************************************************************************"); if (not mc::actor_is_enabled(actor)) simgrid::kernel::EngineImpl::get_instance()->display_all_actor_status(); @@ -43,6 +53,17 @@ void RecordTrace::replay() const simcall->issuer_->simcall_handle(transition->times_considered_); simgrid::mc::execute_actors(); } + + const auto& actor_list = engine->get_actor_list(); + if (actor_list.empty()) { + XBT_INFO("The replay of the trace is complete. The application is terminating."); + } else if (std::none_of(begin(actor_list), end(actor_list), + [](const auto& kv) { return mc::actor_is_enabled(kv.second); })) { + XBT_INFO("The replay of the trace is complete. DEADLOCK detected."); + engine->display_all_actor_status(); + } else { + XBT_INFO("The replay of the trace is complete. The application could run further."); + } } void simgrid::mc::RecordTrace::replay(const std::string& path_string)