X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e080adacaf1ba847ad467f5b8d21da385636ed3c..50102ec1c30562e20d450afa7015374387bf1904:/src/mc/Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index e25e431057..fc286bdb93 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -15,7 +15,9 @@
 #include "xbt/log.h"
 #include "xbt/system_error.hpp"
 
+#include <array>
 #include <memory>
+#include <string>
 
 #include <fcntl.h>
 #ifdef __linux__
@@ -27,7 +29,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
 namespace simgrid {
 namespace mc {
 
-static void run_child_process(int socket, const std::function<void()>& code)
+template <class Code> void run_child_process(int socket, Code code)
 {
   /* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
    * env variable is set. If so, MC mode is assumed, and the client is setup from its side
@@ -50,10 +52,7 @@ static void run_child_process(int socket, const std::function<void()>& code)
   // modifying its .got.plt during snapshot.
   setenv("LC_BIND_NOW", "1", 1);
 
-  char buffer[64];
-  int res = std::snprintf(buffer, sizeof(buffer), "%i", socket);
-  xbt_assert((size_t)res < sizeof(buffer) && res != -1);
-  setenv(MC_ENV_SOCKET_FD, buffer, 1);
+  setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1);
 
   code();
 }
@@ -147,10 +146,10 @@ bool Session::actor_is_enabled(aid_t pid) const
 {
   s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid};
   model_checker_->channel().send(msg);
-  char buff[MC_MESSAGE_LENGTH];
-  ssize_t received = model_checker_->channel().receive(buff, MC_MESSAGE_LENGTH, true);
+  std::array<char, MC_MESSAGE_LENGTH> buff;
+  ssize_t received = model_checker_->channel().receive(buff.data(), buff.size(), true);
   xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED");
-  return ((s_mc_message_int_t*)buff)->value;
+  return ((s_mc_message_int_t*)buff.data())->value;
 }
 
 simgrid::mc::Session* session;