X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f2db04b850386899392bc06568f17f071f8620f..b618e52874a55c893401fdf8237ae61838a46a17:/src/mc/remote/AppSide.cpp diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp index 036fd29fc5..7e642f61b7 100644 --- a/src/mc/remote/AppSide.cpp +++ b/src/mc/remote/AppSide.cpp @@ -45,7 +45,7 @@ AppSide* AppSide::initialize() if (instance_) return instance_.get(); - simgrid::mc::cfg_do_model_check = true; + simgrid::mc::model_checking_mode = ModelCheckingMode::APP_SIDE; setvbuf(stdout, nullptr, _IOLBF, 0); @@ -75,11 +75,6 @@ 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 = {}; - message.type = MessageType::INITIAL_ADDRESSES; - message.mmalloc_default_mdp = mmalloc_get_current_heap(); - xbt_assert(instance_->channel_.send(message) == 0, "Could not send the initial message with addresses."); - instance_->handle_messages(); return instance_.get(); } @@ -152,6 +147,14 @@ void AppSide::handle_finalize(const s_mc_message_int_t* msg) const if (terminate_asap) ::_Exit(0); } +void AppSide::handle_initial_addresses() +{ + this->need_memory_info_ = true; + s_mc_message_initial_addresses_reply_t answer = {}; + answer.type = MessageType::INITIAL_ADDRESSES_REPLY; + answer.mmalloc_default_mdp = mmalloc_get_current_heap(); + xbt_assert(channel_.send(answer) == 0, "Could not send response with initial addresses."); +} void AppSide::handle_actors_status() const { auto const& actor_list = kernel::EngineImpl::get_instance()->get_actor_list(); @@ -183,44 +186,38 @@ void AppSide::handle_actors_status() const } // Serialize each transition to describe what each actor is doing - if (total_transitions > 0) { - std::vector probes(total_transitions); - auto probes_iter = probes.begin(); - - for (const auto& actor_status : status) { - if (not actor_status.enabled) - continue; - - const auto& actor = actor_list.at(actor_status.aid); - const int max_considered = actor_status.max_considered; - - for (int times_considered = 0; times_considered < max_considered; times_considered++, probes_iter++) { - std::stringstream stream; - s_mc_message_simcall_probe_one_t& probe = *probes_iter; - - if (actor->simcall_.observer_ != nullptr) { - actor->simcall_.observer_->prepare(times_considered); - actor->simcall_.observer_->serialize(stream); - } else { - stream << (short)mc::Transition::Type::UNKNOWN; - } - - std::string str = stream.str(); - xbt_assert(str.size() + 1 <= probe.buffer.size(), - "The serialized transition is too large for the buffer. Please fix the code."); - strncpy(probe.buffer.data(), str.c_str(), probe.buffer.size() - 1); - probe.buffer.back() = '\0'; + XBT_DEBUG("Deliver ACTOR_TRANSITION_PROBE payload"); + for (const auto& actor_status : status) { + if (not actor_status.enabled) + continue; + + const auto& actor = actor_list.at(actor_status.aid); + const int max_considered = actor_status.max_considered; + + for (int times_considered = 0; times_considered < max_considered; times_considered++) { + std::stringstream stream; + s_mc_message_simcall_probe_one_t probe; + + if (actor->simcall_.observer_ != nullptr) { + actor->simcall_.observer_->prepare(times_considered); + actor->simcall_.observer_->serialize(stream); + } else { + stream << (short)mc::Transition::Type::UNKNOWN; } - // NOTE: We do NOT need to reset `times_considered` for each actor's - // simcall observer here to the "original" value (i.e. the value BEFORE - // multiple prepare() calls were made for serialization purposes) since - // each SIMCALL_EXECUTE provides a `times_considered` to be used to prepare - // the transition before execution. - } - XBT_DEBUG("Deliver ACTOR_TRANSITION_PROBE payload"); - for (const auto& probe : probes) + std::string str = stream.str(); + xbt_assert(str.size() + 1 <= probe.buffer.size(), + "The serialized transition is too large for the buffer. Please fix the code."); + strncpy(probe.buffer.data(), str.c_str(), probe.buffer.size() - 1); + probe.buffer.back() = '\0'; + xbt_assert(channel_.send(probe) == 0, "Could not send ACTOR_TRANSITION_PROBE payload"); + } + // NOTE: We do NOT need to reset `times_considered` for each actor's + // simcall observer here to the "original" value (i.e. the value BEFORE + // multiple prepare() calls were made for serialization purposes) since + // each SIMCALL_EXECUTE provides a `times_considered` to be used to prepare + // the transition before execution. } } void AppSide::handle_actors_maxpid() const @@ -235,7 +232,7 @@ void AppSide::handle_actors_maxpid() const xbt_assert(received_size == sizeof(_type_), "Unexpected size for " _name_ " (%zd != %zu)", received_size, \ sizeof(_type_)) -void AppSide::handle_messages() const +void AppSide::handle_messages() { while (true) { // Until we get a CONTINUE message XBT_DEBUG("Waiting messages from model-checker"); @@ -243,6 +240,10 @@ void AppSide::handle_messages() const std::array message_buffer; ssize_t received_size = channel_.receive(message_buffer.data(), message_buffer.size()); + if (received_size == 0) { + XBT_DEBUG("Socket closed on the Checker side, bailing out."); + ::_Exit(0); // Nobody's listening to that process anymore => exit as quickly as possible. + } xbt_assert(received_size >= 0, "Could not receive commands from the model-checker"); xbt_assert(static_cast(received_size) >= sizeof(s_mc_message_t), "Cannot handle short message (size=%zd)", received_size); @@ -268,6 +269,11 @@ void AppSide::handle_messages() const handle_finalize((s_mc_message_int_t*)message_buffer.data()); break; + case MessageType::INITIAL_ADDRESSES: + assert_msg_size("INITIAL_ADDRESSES", s_mc_message_t); + handle_initial_addresses(); + break; + case MessageType::ACTORS_STATUS: assert_msg_size("ACTORS_STATUS", s_mc_message_t); handle_actors_status(); @@ -285,7 +291,7 @@ void AppSide::handle_messages() const } } -void AppSide::main_loop() const +void AppSide::main_loop() { simgrid::mc::processes_time.resize(simgrid::kernel::actor::ActorImpl::get_maxpid()); MC_ignore_heap(simgrid::mc::processes_time.data(), @@ -301,7 +307,7 @@ void AppSide::main_loop() const } } -void AppSide::report_assertion_failure() const +void AppSide::report_assertion_failure() { xbt_assert(channel_.send(MessageType::ASSERTION_FAILED) == 0, "Could not send assertion to model-checker"); this->handle_messages(); @@ -309,7 +315,7 @@ void AppSide::report_assertion_failure() const void AppSide::ignore_memory(void* addr, std::size_t size) const { - if (not MC_is_active()) + if (not MC_is_active() || not need_memory_info_) return; s_mc_message_ignore_memory_t message = {}; @@ -321,7 +327,7 @@ 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()) + if (not MC_is_active() || not need_memory_info_) return; const s_xbt_mheap_t* heap = mmalloc_get_current_heap(); @@ -344,7 +350,7 @@ 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()) + if (not MC_is_active() || not need_memory_info_) return; s_mc_message_ignore_memory_t message = {}; @@ -356,8 +362,10 @@ 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()) + if (not MC_is_active() || not need_memory_info_) { + XBT_CRITICAL("Ignore AppSide::declare_symbol(%s)", name); return; + } s_mc_message_register_symbol_t message = {}; message.type = MessageType::REGISTER_SYMBOL; @@ -376,7 +384,7 @@ void AppSide::declare_symbol(const char* name, int* value) const */ void AppSide::declare_stack(void* stack, size_t size, ucontext_t* context) const { - if (not MC_is_active()) + if (not MC_is_active() || not need_memory_info_) return; const s_xbt_mheap_t* heap = mmalloc_get_current_heap();