From d239d3b23481b30b2a17c1d5b1fdb5fec70fd23b Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 3 Feb 2015 15:44:28 +0100
Subject: [PATCH] [mc] Move MC_init_pid outside of mc_server

---
 src/mc/mc_server.cpp  | 2 --
 src/mc/simgrid_mc.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mc/mc_server.cpp b/src/mc/mc_server.cpp
index 3cacf132b7..cd6653e79e 100644
--- a/src/mc/mc_server.cpp
+++ b/src/mc/mc_server.cpp
@@ -45,8 +45,6 @@ void s_mc_server::start()
     throw std::system_error(res, std::system_category());
   XBT_DEBUG("Greeted the MC client");
 
-  MC_init_pid(pid, socket);
-
   // Block SIGCHLD (this will be handled with accept/signalfd):
   sigset_t set;
   sigemptyset(&set);
diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 0f3447709f..d121fdbf73 100644
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -75,6 +75,7 @@ static int do_parent(int socket, pid_t child)
     mc_mode = MC_MODE_SERVER;
     mc_server = new s_mc_server(child, socket);
     mc_server->start();
+    MC_init_pid(child, socket);
     mc_server->resume(&mc_model_checker->process);
     mc_server->loop();
     mc_server->shutdown();
-- 
2.20.1