MC protocol: rename INITIAL_ADDRESSES msg to NEED_MEMINFO

[simgrid.git] / src / mc / remote / AppSide.cpp

diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp
index 7e642f6..8813a4f 100644 (file)
--- a/src/mc/remote/AppSide.cpp
+++ b/src/mc/remote/AppSide.cpp
@@ -64,16 +64,19 @@ AppSide* AppSide::initialize()
   instance_ = std::make_unique<simgrid::mc::AppSide>(fd);
 
   // Wait for the model-checker:
-  errno = 0;
+  if (getenv("MC_NEED_PTRACE") != nullptr) {
+    errno = 0;
 #if defined __linux__
-  ptrace(PTRACE_TRACEME, 0, nullptr, nullptr);
+    ptrace(PTRACE_TRACEME, 0, nullptr, nullptr);
 #elif defined BSD
-  ptrace(PT_TRACE_ME, 0, nullptr, 0);
+    ptrace(PT_TRACE_ME, 0, nullptr, 0);
 #else
-#error "no ptrace equivalent coded for this platform"
+    xbt_die("no ptrace equivalent coded for this platform, please don't use the liveness checker here.");
 #endif
-  xbt_assert(errno == 0 && raise(SIGSTOP) == 0, "Could not wait for the model-checker (errno = %d: %s)", errno,
-             strerror(errno));
+
+    xbt_assert(errno == 0 && raise(SIGSTOP) == 0, "Could not wait for the model-checker (errno = %d: %s)", errno,
+               strerror(errno));
+  }
 
   instance_->handle_messages();
   return instance_.get();
@@ -147,37 +150,27 @@ void AppSide::handle_finalize(const s_mc_message_int_t* msg) const
   if (terminate_asap)
     ::_Exit(0);
 }
-void AppSide::handle_initial_addresses()
+void AppSide::handle_need_meminfo()
 {
-  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.");
+  this->need_memory_info_                  = true;
+  s_mc_message_need_meminfo_reply_t answer = {};
+  answer.type                              = MessageType::NEED_MEMINFO_REPLY;
+  answer.mmalloc_default_mdp               = mmalloc_get_current_heap();
+  xbt_assert(channel_.send(answer) == 0, "Could not send response to the request for meminfo.");
 }
 void AppSide::handle_actors_status() const
 {
   auto const& actor_list = kernel::EngineImpl::get_instance()->get_actor_list();
-  const int num_actors   = actor_list.size();
-  XBT_DEBUG("Serialize the actors to answer ACTORS_STATUS from the checker. %d actors to go.", num_actors);
-
-  std::vector<s_mc_message_actors_status_one_t> status(num_actors);
-  int i                 = 0;
-  int total_transitions = 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();
-    status[i].n_transitions  = mc::actor_is_enabled(actor) ? status[i].max_considered : 0;
-    total_transitions += status[i].n_transitions;
-    i++;
-  }
+  XBT_DEBUG("Serialize the actors to answer ACTORS_STATUS from the checker. %zu actors to go.", actor_list.size());
+
+  std::vector<s_mc_message_actors_status_one_t> status;
+  for (auto const& [aid, actor] : actor_list)
+    status.emplace_back(s_mc_message_actors_status_one_t{aid, mc::actor_is_enabled(actor),
+                                                         actor->simcall_.observer_->get_max_consider()});
 
   struct s_mc_message_actors_status_answer_t answer = {};
   answer.type             = MessageType::ACTORS_STATUS_REPLY;
-  answer.count            = num_actors;
-  answer.transition_count = total_transitions;
+  answer.count            = static_cast<int>(status.size());
 
   xbt_assert(channel_.send(answer) == 0, "Could not send ACTORS_STATUS_REPLY msg");
   if (answer.count > 0) {
@@ -269,9 +262,9 @@ void AppSide::handle_messages()
         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();
+      case MessageType::NEED_MEMINFO:
+        assert_msg_size("NEED_MEMINFO", s_mc_message_t);
+        handle_need_meminfo();
         break;
 
       case MessageType::ACTORS_STATUS: