X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4e4b7da7f6a6d04b659f0aa9c1de8733939096f..3427c060e899b47c103c6981aa69afbb22378b24:/src/mc/remote/AppSide.cpp?ds=sidebyside diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp index 80e4c5230a..7e6e4145f2 100644 --- a/src/mc/remote/AppSide.cpp +++ b/src/mc/remote/AppSide.cpp @@ -11,20 +11,18 @@ #include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/mc_base.hpp" #include "src/mc/mc_config.hpp" -#include "src/mc/remote/RemoteProcess.hpp" +#include "src/mc/sosp/RemoteProcessMemory.hpp" #if HAVE_SMPI #include "src/smpi/include/private.hpp" #endif #include "src/sthread/sthread.h" -#include "xbt/coverage.h" +#include "src/xbt/coverage.h" #include "xbt/str.h" -#include "xbt/xbt_modinter.h" /* mmalloc_preinit to get the default mmalloc arena address */ #include #include #include // setvbuf #include -#include #include #include #include @@ -47,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); @@ -77,10 +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{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(); return instance_.get(); } @@ -100,7 +94,9 @@ void AppSide::handle_deadlock_check(const s_mc_message_t*) const engine->display_all_actor_status(); } // Send result: - s_mc_message_int_t answer{MessageType::DEADLOCK_CHECK_REPLY, deadlock}; + s_mc_message_int_t answer = {}; + answer.type = MessageType::DEADLOCK_CHECK_REPLY; + answer.value = 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 @@ -114,8 +110,7 @@ void AppSide::handle_simcall_execute(const s_mc_message_simcall_execute_t* messa 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)); + s_mc_message_simcall_execute_answer_t answer = {}; answer.type = MessageType::SIMCALL_EXECUTE_ANSWER; std::stringstream stream; if (actor->simcall_.observer_ != nullptr) { @@ -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(); @@ -171,9 +174,10 @@ void AppSide::handle_actors_status() const i++; } - struct s_mc_message_actors_status_answer_t answer { - MessageType::ACTORS_STATUS_REPLY, num_actors, total_transitions - }; + struct s_mc_message_actors_status_answer_t answer = {}; + answer.type = MessageType::ACTORS_STATUS_REPLY; + answer.count = num_actors; + answer.transition_count = total_transitions; xbt_assert(channel_.send(answer) == 0, "Could not send ACTORS_STATUS_REPLY msg"); if (answer.count > 0) { @@ -216,18 +220,25 @@ void AppSide::handle_actors_status() const // each SIMCALL_EXECUTE provides a `times_considered` to be used to prepare // the transition before execution. } - - size_t size = probes.size() * sizeof(s_mc_message_simcall_probe_one_t); XBT_DEBUG("Deliver ACTOR_TRANSITION_PROBE payload"); - xbt_assert(channel_.send(probes.data(), size) == 0, "Could not send ACTOR_TRANSITION_PROBE payload"); + + for (const auto& probe : probes) + xbt_assert(channel_.send(probe) == 0, "Could not send ACTOR_TRANSITION_PROBE payload"); } } +void AppSide::handle_actors_maxpid() const +{ + s_mc_message_int_t answer = {}; + answer.type = MessageType::ACTORS_MAXPID_REPLY; + answer.value = kernel::actor::ActorImpl::get_maxpid(); + xbt_assert(channel_.send(answer) == 0, "Could not send response"); +} #define assert_msg_size(_name_, _type_) \ 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"); @@ -236,6 +247,8 @@ void AppSide::handle_messages() const ssize_t received_size = channel_.receive(message_buffer.data(), message_buffer.size()); 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); const s_mc_message_t* message = (s_mc_message_t*)message_buffer.data(); switch (message->type) { @@ -258,11 +271,21 @@ 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(); break; + case MessageType::ACTORS_MAXPID: + assert_msg_size("ACTORS_MAXPID", s_mc_message_t); + handle_actors_maxpid(); + break; + default: xbt_die("Received unexpected message %s (%i)", to_c_str(message->type), static_cast(message->type)); break; @@ -270,7 +293,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(), @@ -286,7 +309,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(); @@ -294,10 +317,10 @@ 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; + s_mc_message_ignore_memory_t message = {}; message.type = MessageType::IGNORE_MEMORY; message.addr = (std::uintptr_t)addr; message.size = size; @@ -306,12 +329,12 @@ 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(); - s_mc_message_ignore_heap_t message; + s_mc_message_ignore_heap_t message = {}; message.type = MessageType::IGNORE_HEAP; message.address = address; message.size = size; @@ -329,10 +352,10 @@ 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; + s_mc_message_ignore_memory_t message = {}; message.type = MessageType::UNIGNORE_HEAP; message.addr = (std::uintptr_t)address; message.size = size; @@ -341,11 +364,12 @@ 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; - memset(&message, 0, sizeof(message)); + s_mc_message_register_symbol_t 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() - 1); @@ -362,19 +386,18 @@ 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(); - s_stack_region_t region; - memset(®ion, 0, sizeof(region)); + s_stack_region_t region = {}; region.address = stack; region.context = context; region.size = size; region.block = ((char*)stack - (char*)heap->heapbase) / BLOCKSIZE + 1; - s_mc_message_stack_region_t message; + s_mc_message_stack_region_t message = {}; message.type = MessageType::STACK_REGION; message.stack_region = region; xbt_assert(channel_.send(message) == 0, "Could not send STACK_REGION to model-checker");