X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c13d2a7dcb7479d08fc80507b4860c83ec0713a..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/mc/Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 1eaae21f90..37a048762b 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,12 +9,14 @@
 #include "src/internal_config.h" // HAVE_SMPI
 #if HAVE_SMPI
 #include "smpi/smpi.h"
+#include "src/smpi/include/private.hpp"
 #endif
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_state.hpp"
 #include "xbt/log.h"
 #include "xbt/system_error.hpp"
 
+#include "signal.h"
 #include <array>
 #include <memory>
 #include <string>
@@ -39,16 +41,14 @@ template <class Code> void run_child_process(int socket, Code code)
   // Make sure we do not outlive our parent
   sigset_t mask;
   sigemptyset (&mask);
-  int sigprocmask_res = sigprocmask(SIG_SETMASK, &mask, nullptr);
-  xbt_assert(sigprocmask_res >= 0, "Could not unblock signals");
-  int prctl_res = prctl(PR_SET_PDEATHSIG, SIGHUP);
-  xbt_assert(prctl_res == 0, "Could not PR_SET_PDEATHSIG");
+  xbt_assert(sigprocmask(SIG_SETMASK, &mask, nullptr) >= 0, "Could not unblock signals");
+  xbt_assert(prctl(PR_SET_PDEATHSIG, SIGHUP) == 0, "Could not PR_SET_PDEATHSIG");
 #endif
 
   // Remove CLOEXEC to pass the socket to the application
-  int fdflags   = fcntl(socket, F_GETFD, 0);
-  int fcntl_res = fdflags != -1 ? fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) : -1;
-  xbt_assert(fcntl_res != -1, "Could not remove CLOEXEC for socket");
+  int fdflags = fcntl(socket, F_GETFD, 0);
+  xbt_assert(fdflags != -1 && fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) != -1,
+             "Could not remove CLOEXEC for socket");
 
   // Disable lazy relocation in the model-checked process to prevent the application from
   // modifying its .got.plt during snapshot.
@@ -71,8 +71,7 @@ Session::Session(const std::function<void()>& code)
   // between the model-checker process (ourselves) and the model-checked
   // process:
   int sockets[2];
-  int res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets);
-  xbt_assert(res != -1, "Could not create socketpair");
+  xbt_assert(socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets) != -1, "Could not create socketpair");
 
   pid_t pid = fork();
   xbt_assert(pid >= 0, "Could not fork model-checked process");
@@ -108,10 +107,11 @@ void Session::take_initial_snapshot()
   initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
 }
 
-void Session::execute(Transition const& transition) const
+simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> Session::execute(Transition const& transition) const
 {
-  model_checker_->handle_simcall(transition);
+  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> res = model_checker_->handle_simcall(transition);
   model_checker_->wait_for_requests();
+  return res;
 }
 
 void Session::restore_initial_state() const
@@ -146,7 +146,8 @@ void Session::close()
 
 bool Session::actor_is_enabled(aid_t pid) const
 {
-  s_mc_message_actor_enabled_t msg{};
+  s_mc_message_actor_enabled_t msg;
+  memset(&msg, 0, sizeof msg);
   msg.type = simgrid::mc::MessageType::ACTOR_ENABLED;
   msg.aid  = pid;
   model_checker_->channel().send(msg);