Merge branch 'dev-mailbox-clear' into 'master'

[simgrid.git] / src / mc / ModelChecker.cpp

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index ea47b490cab194187fe33cb6a63da13ed740e982..cf46e6834206b761eac58845ceea0f6ea5d93625 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -4,8 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/Session.hpp"
-#include "src/mc/checker/Checker.hpp"
+#include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
 #include "src/mc/mc_private.hpp"
@@ -75,6 +74,7 @@ void ModelChecker::start()
 
   setup_ignore();
 
+  errno = 0;
 #ifdef __linux__
   ptrace(PTRACE_SETOPTIONS, pid, nullptr, PTRACE_O_TRACEEXIT);
   ptrace(PTRACE_CONT, pid, 0, 0);
@@ -83,6 +83,11 @@ void ModelChecker::start()
 #else
 # error "no ptrace equivalent coded for this platform"
 #endif
+  xbt_assert(errno == 0,
+             "Ptrace does not seem to be usable in your setup (errno: %d). "
+             "If you run from within a docker, adding `--cap-add SYS_PTRACE` to the docker line may help. "
+             "If it does not help, please report this bug.",
+             errno);
 }
 
 static constexpr auto ignored_local_variables = {
@@ -135,16 +140,18 @@ static void MC_report_crash(int status)
     XBT_INFO("From exit: %i", WEXITSTATUS(status));
   if (not xbt_log_no_loc)
     XBT_INFO("%s core dump was generated by the system.", WCOREDUMP(status) ? "A" : "No");
-  XBT_INFO("Counter-example execution trace:");
-  for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
-    XBT_INFO("  %s", s.c_str());
-  XBT_INFO("Path = %s", mc_model_checker->getChecker()->get_record_trace().to_string().c_str());
-  session_singleton->log_state();
-  if (xbt_log_no_loc) {
-    XBT_INFO("Stack trace not displayed because you passed --log=no_loc");
-  } else {
-    XBT_INFO("Stack trace:");
-    mc_model_checker->get_remote_process().dump_stack();
+  if (mc_model_checker->get_exploration()) {
+    XBT_INFO("Counter-example execution trace:");
+    for (auto const& s : mc_model_checker->get_exploration()->get_textual_trace())
+      XBT_INFO("  %s", s.c_str());
+    XBT_INFO("Path = %s", mc_model_checker->get_exploration()->get_record_trace().to_string().c_str());
+    Api::get().get_session().log_state();
+    if (xbt_log_no_loc) {
+      XBT_INFO("Stack trace not displayed because you passed --log=no_loc");
+    } else {
+      XBT_INFO("Stack trace:");
+      mc_model_checker->get_remote_process().dump_stack();
+    }
   }
 }
 
@@ -160,7 +167,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
       xbt_assert(size == sizeof(message), "Broken message. Got %d bytes instead of %d.", (int)size, (int)sizeof(message));
       memcpy(&message, buffer, sizeof(message));
 
-      get_remote_process().init(message.mmalloc_default_mdp, message.maxpid, message.actors, message.dead_actors);
+      get_remote_process().init(message.mmalloc_default_mdp, message.maxpid, message.actors);
       break;
     }
 
@@ -227,10 +234,10 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
       XBT_INFO("*** PROPERTY NOT VALID ***");
       XBT_INFO("**************************");
       XBT_INFO("Counter-example execution trace:");
-      for (auto const& s : getChecker()->get_textual_trace())
+      for (auto const& s : get_exploration()->get_textual_trace())
         XBT_INFO("  %s", s.c_str());
-      XBT_INFO("Path = %s", getChecker()->get_record_trace().to_string().c_str());
-      session_singleton->log_state();
+      XBT_INFO("Path = %s", get_exploration()->get_record_trace().to_string().c_str());
+      Api::get().get_session().log_state();
 
       this->exit(SIMGRID_MC_EXIT_SAFETY);
 
@@ -336,30 +343,6 @@ Transition* ModelChecker::handle_simcall(aid_t aid, int times_considered, bool n
   } else
     return nullptr;
 }
-bool ModelChecker::simcall_is_visible(aid_t aid)
-{
-  xbt_assert(mc_model_checker != nullptr, "This should be called from the checker side");
-
-  s_mc_message_simcall_is_visible_t m;
-  memset(&m, 0, sizeof(m));
-  m.type = MessageType::SIMCALL_IS_VISIBLE;
-  m.aid  = aid;
-  checker_side_.get_channel().send(m);
-
-  s_mc_message_simcall_is_visible_answer_t answer;
-  ssize_t s = checker_side_.get_channel().receive(answer);
-  xbt_assert(s != -1, "Could not receive message");
-  xbt_assert(s == sizeof(answer) && answer.type == MessageType::SIMCALL_IS_VISIBLE_ANSWER,
-             "Received unexpected message %s (%i, size=%i) "
-             "expected MessageType::SIMCALL_IS_VISIBLE_ANSWER (%i, size=%i)",
-             to_c_str(answer.type), (int)answer.type, (int)s, (int)MessageType::SIMCALL_IS_VISIBLE_ANSWER,
-             (int)sizeof(answer));
-
-  XBT_DEBUG("is_visible(%ld) is returning %s", aid, answer.value ? "true" : "false");
-
-  this->remote_process_->clear_cache();
-  return answer.value;
-}
 
 void ModelChecker::finalize_app(bool terminate_asap)
 {
@@ -373,19 +356,5 @@ void ModelChecker::finalize_app(bool terminate_asap)
   xbt_assert(checker_side_.get_channel().receive(answer) != -1, "Could not receive answer to FINALIZE");
 }
 
-bool ModelChecker::checkDeadlock()
-{
-  xbt_assert(checker_side_.get_channel().send(MessageType::DEADLOCK_CHECK) == 0, "Could not check deadlock state");
-  s_mc_message_int_t message;
-  ssize_t s = checker_side_.get_channel().receive(message);
-  xbt_assert(s != -1, "Could not receive message");
-  xbt_assert(s == sizeof(message) && message.type == MessageType::DEADLOCK_CHECK_REPLY,
-             "Received unexpected message %s (%i, size=%i) "
-             "expected MessageType::DEADLOCK_CHECK_REPLY (%i, size=%i)",
-             to_c_str(message.type), (int)message.type, (int)s, (int)MessageType::DEADLOCK_CHECK_REPLY,
-             (int)sizeof(message));
-  return message.value != 0;
-}
-
 } // namespace mc
 } // namespace simgrid