Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Simplify loop.
[simgrid.git] / src / mc / remote / AppSide.cpp
index 7c970ff..216227f 100644 (file)
@@ -147,8 +147,9 @@ void AppSide::handle_finalize(const s_mc_message_int_t* msg) const
   if (terminate_asap)
     ::_Exit(0);
 }
-void AppSide::handle_initial_addresses() const
+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();
@@ -157,26 +158,16 @@ void AppSide::handle_initial_addresses() const
 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) {
@@ -185,44 +176,38 @@ void AppSide::handle_actors_status() const
   }
 
   // Serialize each transition to describe what each actor is doing
-  if (total_transitions > 0) {
-    std::vector<s_mc_message_simcall_probe_one_t> 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
@@ -237,7 +222,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");
@@ -245,6 +230,10 @@ void AppSide::handle_messages() const
     std::array<char, MC_MESSAGE_LENGTH> 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<size_t>(received_size) >= sizeof(s_mc_message_t), "Cannot handle short message (size=%zd)",
                received_size);
@@ -292,7 +281,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(),
@@ -308,7 +297,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();
@@ -363,8 +352,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() || not need_memory_info_)
+  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;