Set waitpid() for model-checked flags according to platform.

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

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 0b7eadf..6aff9c4 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -40,6 +40,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 
 using simgrid::mc::remote;
 
+#ifdef __linux__
+# define WAITPID_CHECKED_FLAGS __WALL
+#else
+# define WAITPID_CHECKED_FLAGS 0
+#endif
+
 // Hardcoded index for now:
 #define SOCKET_FD_INDEX 0
 #define SIGNAL_FD_INDEX 1
@@ -48,7 +54,6 @@ namespace simgrid {
 namespace mc {
 
 ModelChecker::ModelChecker(std::unique_ptr<Process> process) :
-  hostnames_(xbt_dict_new()),
   page_store_(500),
   process_(std::move(process)),
   parent_snapshot_(nullptr)
@@ -56,22 +61,7 @@ ModelChecker::ModelChecker(std::unique_ptr<Process> process) :
 
 }
 
-ModelChecker::~ModelChecker()
-{
-  xbt_dict_free(&this->hostnames_);
-}
-
-const char* ModelChecker::get_host_name(const char* hostname)
-{
-  // Lookup the host name in the dictionary (or create it):
-  xbt_dictelm_t elt = xbt_dict_get_elm_or_null(this->hostnames_, hostname);
-  if (!elt) {
-    xbt_dict_set(this->hostnames_, hostname, nullptr, nullptr);
-    elt = xbt_dict_get_elm_or_null(this->hostnames_, hostname);
-    assert(elt);
-  }
-  return elt->key;
-}
+ModelChecker::~ModelChecker() {}
 
 void ModelChecker::start()
 {
@@ -82,7 +72,7 @@ void ModelChecker::start()
   sigemptyset(&set);
   sigaddset(&set, SIGCHLD);
   if (sigprocmask(SIG_BLOCK, &set, nullptr) == -1)
-    throw simgrid::xbt::errno_error(errno);
+    throw simgrid::xbt::errno_error();
 
   sigset_t full_set;
   sigfillset(&full_set);
@@ -96,7 +86,7 @@ void ModelChecker::start()
 
   int signal_fd = signalfd(-1, &set, 0);
   if (signal_fd == -1)
-    throw simgrid::xbt::errno_error(errno);
+    throw simgrid::xbt::errno_error();
 
   struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX];
   signalfd_pollfd->fd = signal_fd;
@@ -107,7 +97,7 @@ void ModelChecker::start()
   int status;
 
   // The model-checked process SIGSTOP itself to signal it's ready:
-  pid_t res = waitpid(pid, &status, __WALL);
+  pid_t res = waitpid(pid, &status, WAITPID_CHECKED_FLAGS);
   if (res < 0 || !WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
     xbt_die("Could not wait model-checked process");
 
@@ -149,9 +139,6 @@ void ModelChecker::setup_ignore()
 
   /* Static variable used for tracing */
   process.ignore_global_variable("counter");
-
-  /* SIMIX */
-  process.ignore_global_variable("smx_total_comms");
 }
 
 void ModelChecker::shutdown()
@@ -170,7 +157,7 @@ void ModelChecker::resume(simgrid::mc::Process& process)
 {
   int res = process.getChannel().send(MC_MESSAGE_CONTINUE);
   if (res)
-    throw simgrid::xbt::errno_error(res);
+    throw simgrid::xbt::errno_error();
   process.clear_cache();
 }
 
@@ -181,7 +168,7 @@ void throw_socket_error(int fd)
   socklen_t errlen = sizeof(error);
   if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen) == -1)
     error = errno;
-  throw simgrid::xbt::errno_error(errno);
+  throw simgrid::xbt::errno_error();
 }
 
 static void MC_report_crash(int status)
@@ -313,10 +300,10 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size)
   return true;
 }
 
-/** Terminate the model-checker aplication */
+/** Terminate the model-checker application */
 void ModelChecker::exit(int status)
 {
-  // TODO, terminate the model checker politely instead of exiting rudel
+  // TODO, terminate the model checker politely instead of exiting rudely
   if (process().running())
     kill(process().pid(), SIGKILL);
   ::exit(status);
@@ -333,7 +320,7 @@ bool ModelChecker::handle_events()
     case EINTR:
       continue;
     default:
-      throw simgrid::xbt::errno_error(errno);
+      throw simgrid::xbt::errno_error();
     }
   }
 
@@ -341,7 +328,7 @@ bool ModelChecker::handle_events()
     if (socket_pollfd->revents & POLLIN) {
       ssize_t size = process_->getChannel().receive(buffer, sizeof(buffer), false);
       if (size == -1 && errno != EAGAIN)
-        throw simgrid::xbt::errno_error(errno);
+        throw simgrid::xbt::errno_error();
       return handle_message(buffer, size);
     }
     if (socket_pollfd->revents & POLLERR)
@@ -380,7 +367,7 @@ void ModelChecker::handle_signals()
       if (errno == EINTR)
         continue;
       else
-        throw simgrid::xbt::errno_error(errno);
+        throw simgrid::xbt::errno_error();
     } else if (size != sizeof(info))
         return throw std::runtime_error(
           "Bad communication with model-checked application");
@@ -405,7 +392,7 @@ void ModelChecker::handle_waitpid()
           break;
       } else {
         XBT_ERROR("Could not wait for pid");
-        throw simgrid::xbt::errno_error(errno);
+        throw simgrid::xbt::errno_error();
       }
     }
 
@@ -479,9 +466,8 @@ bool ModelChecker::checkDeadlock()
   if (s == -1)
     xbt_die("Could not receive message");
   if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY)
-    xbt_die("%s received unexpected message %s (%i, size=%i) "
+    xbt_die("Received unexpected message %s (%i, size=%i) "
       "expected MC_MESSAGE_DEADLOCK_CHECK_REPLY (%i, size=%i)",
-      MC_mode_name(mc_mode),
       MC_message_type_name(message.type), (int) message.type, (int) s,
       (int) MC_MESSAGE_DEADLOCK_CHECK_REPLY, (int) sizeof(message)
       );