X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5428c085f5ef060ea8c23bc8ada6afc47fe7d2d..b3a19f2cc0136088a395b37f4a9cfd9578815f06:/src/mc/remote/AppSide.cpp diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp index 496c5bc533..fe481ca3d8 100644 --- a/src/mc/remote/AppSide.cpp +++ b/src/mc/remote/AppSide.cpp @@ -10,6 +10,7 @@ #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/mc_base.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/remote/RemoteProcess.hpp" #if HAVE_SMPI #include "src/smpi/include/private.hpp" @@ -29,9 +30,9 @@ #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic"); +XBT_LOG_EXTERNAL_CATEGORY(mc_global); -namespace simgrid { -namespace mc { +namespace simgrid::mc { std::unique_ptr AppSide::instance_; @@ -44,7 +45,7 @@ AppSide* AppSide::initialize() if (instance_) return instance_.get(); - _sg_do_model_check = 1; + simgrid::mc::cfg_do_model_check = true; setvbuf(stdout, nullptr, _IOLBF, 0); @@ -74,9 +75,8 @@ AppSide* AppSide::initialize() xbt_assert(errno == 0 && raise(SIGSTOP) == 0, "Could not wait for the model-checker (errno = %d: %s)", errno, strerror(errno)); - s_mc_message_initial_addresses_t message{MessageType::INITIAL_ADDRESSES, mmalloc_preinit(), - kernel::actor::get_maxpid_addr(), kernel::get_actors_addr(), - kernel::get_dead_actors_addr()}; + s_mc_message_initial_addresses_t message{MessageType::INITIAL_ADDRESSES, mmalloc_get_current_heap(), + kernel::actor::ActorImpl::get_maxpid_addr()}; xbt_assert(instance_->channel_.send(message) == 0, "Could not send the initial message with addresses."); instance_->handle_messages(); @@ -85,51 +85,93 @@ AppSide* AppSide::initialize() void AppSide::handle_deadlock_check(const s_mc_message_t*) const { - const auto& actor_list = kernel::EngineImpl::get_instance()->get_actor_list(); + const auto* engine = kernel::EngineImpl::get_instance(); + const auto& actor_list = engine->get_actor_list(); bool deadlock = not actor_list.empty() && std::none_of(begin(actor_list), end(actor_list), [](const auto& kv) { return mc::actor_is_enabled(kv.second); }); + if (deadlock) { + XBT_CINFO(mc_global, "**************************"); + XBT_CINFO(mc_global, "*** DEADLOCK DETECTED ***"); + XBT_CINFO(mc_global, "**************************"); + engine->display_all_actor_status(); + } // Send result: s_mc_message_int_t answer{MessageType::DEADLOCK_CHECK_REPLY, deadlock}; xbt_assert(channel_.send(answer) == 0, "Could not send response"); } void AppSide::handle_simcall_execute(const s_mc_message_simcall_execute_t* message) const { - kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(message->aid_); + kernel::actor::ActorImpl* actor = kernel::EngineImpl::get_instance()->get_actor_by_pid(message->aid_); xbt_assert(actor != nullptr, "Invalid pid %ld", message->aid_); + // The client may send some messages to the server while processing the transition + actor->simcall_handle(message->times_considered_); + // Say the server that the transition is over and that it should proceed + xbt_assert(channel_.send(MessageType::WAITING) == 0, "Could not send MESSAGE_WAITING to model-checker"); + // Finish the RPC from the server: return a serialized observer, to build a Transition on Checker side s_mc_message_simcall_execute_answer_t answer; memset(&answer, 0, sizeof(answer)); answer.type = MessageType::SIMCALL_EXECUTE_ANSWER; + std::stringstream stream; if (actor->simcall_.observer_ != nullptr) { - std::stringstream stream; - actor->simcall_.observer_->serialize(answer.simcall, stream); - xbt_assert(stream.str().size() < sizeof(answer.buffer) - 1, - "The serialized simcall is too large for the buffer. Please fix the code."); - strncpy(answer.buffer, stream.str().c_str(), sizeof(answer.buffer) - 1); + actor->simcall_.observer_->serialize(stream); } else { - answer.simcall = mc::Transition::Type::UNKNOWN; + stream << (short)mc::Transition::Type::UNKNOWN; } + std::string str = stream.str(); + xbt_assert(str.size() + 1 <= answer.buffer.size(), + "The serialized simcall is too large for the buffer. Please fix the code."); + strncpy(answer.buffer.data(), str.c_str(), answer.buffer.size() - 1); + answer.buffer.back() = '\0'; - XBT_DEBUG("send SIMCALL_EXECUTE_ANSWER(%s) ~> %s '%s'", actor->get_cname(), mc::Transition::to_c_str(answer.simcall), - answer.buffer); + XBT_DEBUG("send SIMCALL_EXECUTE_ANSWER(%s) ~> '%s'", actor->get_cname(), str.c_str()); xbt_assert(channel_.send(answer) == 0, "Could not send response"); - - // The client may send some messages to the server while processing the transition - actor->simcall_handle(message->times_considered_); - - // Say the server that the transition is over and that it should proceed - xbt_assert(channel_.send(MessageType::WAITING) == 0, "Could not send MESSAGE_WAITING to model-checker"); } -void AppSide::handle_actor_enabled(const s_mc_message_actor_enabled_t* msg) const +void AppSide::handle_finalize(const s_mc_message_int_t* msg) const +{ + bool terminate_asap = msg->value; + XBT_DEBUG("Finalize (terminate = %d)", (int)terminate_asap); + if (not terminate_asap) { + if (XBT_LOG_ISENABLED(mc_client, xbt_log_priority_debug)) + kernel::EngineImpl::get_instance()->display_all_actor_status(); +#if HAVE_SMPI + XBT_DEBUG("Smpi_enabled: %d", SMPI_is_inited()); + if (SMPI_is_inited()) + SMPI_finalize(); +#endif + } + coverage_checkpoint(); + xbt_assert(channel_.send(MessageType::FINALIZE_REPLY) == 0, "Could not answer to FINALIZE"); + std::fflush(stdout); + if (terminate_asap) + ::_Exit(0); +} +void AppSide::handle_actors_status() const { - bool res = mc::actor_is_enabled(kernel::actor::ActorImpl::by_pid(msg->aid)); - s_mc_message_int_t answer{MessageType::ACTOR_ENABLED_REPLY, res}; - XBT_DEBUG("Actor %ld %s enabled", msg->aid, (res ? "IS" : "is NOT")); - xbt_assert(channel_.send(answer) == 0, "Could not send ACTOR_ENABLED_REPLY"); + auto const& actor_list = kernel::EngineImpl::get_instance()->get_actor_list(); + int count = actor_list.size(); + XBT_DEBUG("Serialize the actors to answer ACTORS_STATUS from the checker. %d actors to go.", count); + + struct s_mc_message_actors_status_answer_t answer { + MessageType::ACTORS_STATUS_REPLY, count + }; + std::vector status(count); + int i = 0; + for (auto const& [aid, actor] : actor_list) { + status[i].aid = aid; + status[i].enabled = mc::actor_is_enabled(actor); + status[i].max_considered = actor->simcall_.observer_->get_max_consider(); + i++; + } + xbt_assert(channel_.send(answer) == 0, "Could not send ACTORS_STATUS_REPLY msg"); + if (answer.count > 0) { + size_t size = status.size() * sizeof(s_mc_message_actors_status_one_t); + xbt_assert(channel_.send(status.data(), size) == 0, "Could not send ACTORS_STATUS_REPLY data"); + } } #define assert_msg_size(_name_, _type_) \ @@ -162,46 +204,15 @@ void AppSide::handle_messages() const handle_simcall_execute((s_mc_message_simcall_execute_t*)message_buffer.data()); break; - case MessageType::SIMCALL_IS_VISIBLE: { - assert_msg_size("SIMCALL_IS_VISIBLE", s_mc_message_simcall_is_visible_t); - auto msg_simcall = (s_mc_message_simcall_is_visible_t*)message_buffer.data(); - const kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(msg_simcall->aid); - xbt_assert(actor != nullptr, "Invalid pid %ld", msg_simcall->aid); - xbt_assert(actor->simcall_.observer_, "The transition of %s has no observer", actor->get_cname()); - bool value = actor->simcall_.observer_->is_visible(); - - // Send result: - s_mc_message_simcall_is_visible_answer_t answer{MessageType::SIMCALL_IS_VISIBLE_ANSWER, value}; - xbt_assert(channel_.send(answer) == 0, "Could not send response"); - break; - } - - case MessageType::ACTOR_ENABLED: - assert_msg_size("ACTOR_ENABLED", s_mc_message_actor_enabled_t); - handle_actor_enabled((s_mc_message_actor_enabled_t*)message_buffer.data()); + case MessageType::FINALIZE: + assert_msg_size("FINALIZE", s_mc_message_int_t); + handle_finalize((s_mc_message_int_t*)message_buffer.data()); break; - case MessageType::FINALIZE: { - assert_msg_size("FINALIZE", s_mc_message_int_t); - bool terminate_asap = ((s_mc_message_int_t*)message_buffer.data())->value; - XBT_DEBUG("Finalize (terminate = %d)", (int)terminate_asap); - if (not terminate_asap) { - if (XBT_LOG_ISENABLED(mc_client, xbt_log_priority_debug)) - kernel::EngineImpl::get_instance()->display_all_actor_status(); -#if HAVE_SMPI - XBT_DEBUG("Smpi_enabled: %d", (int)smpi_enabled()); - if (smpi_enabled()) - SMPI_finalize(); -#endif - } - coverage_checkpoint(); - xbt_assert(channel_.send(MessageType::DEADLOCK_CHECK_REPLY) == 0, // DEADLOCK_CHECK_REPLY, really? - "Could not answer to FINALIZE"); - std::fflush(stdout); - if (terminate_asap) - ::_Exit(0); + case MessageType::ACTORS_STATUS: + assert_msg_size("ACTORS_STATUS", s_mc_message_t); + handle_actors_status(); break; - } default: xbt_die("Received unexpected message %s (%i)", to_c_str(message->type), static_cast(message->type)); @@ -212,6 +223,10 @@ void AppSide::handle_messages() const void AppSide::main_loop() const { + simgrid::mc::processes_time.resize(simgrid::kernel::actor::ActorImpl::get_maxpid()); + MC_ignore_heap(simgrid::mc::processes_time.data(), + simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0])); + coverage_checkpoint(); while (true) { simgrid::mc::execute_actors(); @@ -228,6 +243,9 @@ void AppSide::report_assertion_failure() const void AppSide::ignore_memory(void* addr, std::size_t size) const { + if (not MC_is_active()) + return; + s_mc_message_ignore_memory_t message; message.type = MessageType::IGNORE_MEMORY; message.addr = (std::uintptr_t)addr; @@ -237,6 +255,9 @@ void AppSide::ignore_memory(void* addr, std::size_t size) const void AppSide::ignore_heap(void* address, std::size_t size) const { + if (not MC_is_active()) + return; + const s_xbt_mheap_t* heap = mmalloc_get_current_heap(); s_mc_message_ignore_heap_t message; @@ -257,6 +278,9 @@ void AppSide::ignore_heap(void* address, std::size_t size) const void AppSide::unignore_heap(void* address, std::size_t size) const { + if (not MC_is_active()) + return; + s_mc_message_ignore_memory_t message; message.type = MessageType::UNIGNORE_HEAP; message.addr = (std::uintptr_t)address; @@ -266,18 +290,30 @@ void AppSide::unignore_heap(void* address, std::size_t size) const void AppSide::declare_symbol(const char* name, int* value) const { + if (not MC_is_active()) + return; + s_mc_message_register_symbol_t message; memset(&message, 0, sizeof(message)); message.type = MessageType::REGISTER_SYMBOL; xbt_assert(strlen(name) + 1 <= message.name.size(), "Symbol is too long"); - strncpy(message.name.data(), name, message.name.size()); + strncpy(message.name.data(), name, message.name.size() - 1); message.callback = nullptr; message.data = value; xbt_assert(channel_.send(message) == 0, "Could send REGISTER_SYMBOL message to model-checker"); } +/** Register a stack in the model checker + * + * The stacks are allocated in the heap. The MC handle them specifically + * when we analyze/compare the content of the heap so it must be told where + * they are with this function. + */ void AppSide::declare_stack(void* stack, size_t size, ucontext_t* context) const { + if (not MC_is_active()) + return; + const s_xbt_mheap_t* heap = mmalloc_get_current_heap(); s_stack_region_t region; @@ -292,5 +328,4 @@ void AppSide::declare_stack(void* stack, size_t size, ucontext_t* context) const message.stack_region = region; xbt_assert(channel_.send(message) == 0, "Could not send STACK_REGION to model-checker"); } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc