From 4b5f366a8a5e31aefbd2f2d211ddfe951624df68 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 3 Feb 2015 15:36:02 +0100
Subject: [PATCH] [mc] Remove some functions in mc_server

---
 src/mc/mc_server.cpp  | 24 ------------------------
 src/mc/mc_server.h    | 14 --------------
 src/mc/simgrid_mc.cpp | 22 +++++++++++++++++-----
 3 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/src/mc/mc_server.cpp b/src/mc/mc_server.cpp
index cc7c5250bb..3cacf132b7 100644
--- a/src/mc/mc_server.cpp
+++ b/src/mc/mc_server.cpp
@@ -28,30 +28,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_server, mc, "MC server logic");
 
 mc_server_t mc_server;
 
-int MC_server_init(pid_t pid, int socket)
-{
-  if (mc_server)
-    xbt_die("MC server already present");
-  mc_mode = MC_MODE_SERVER;
-  mc_server = new s_mc_server(pid, socket);
-  mc_server->start();
-  return 0;
-}
-
-void MC_server_run(void)
-{
-  try {
-    mc_server->resume(&mc_model_checker->process);
-    mc_server->loop();
-    mc_server->shutdown();
-    mc_server->exit();
-  }
-  catch(std::exception& e) {
-    XBT_ERROR(e.what());
-    exit(MC_SERVER_ERROR);
-  }
-}
-
 s_mc_server::s_mc_server(pid_t pid, int socket)
 {
   this->pid = pid;
diff --git a/src/mc/mc_server.h b/src/mc/mc_server.h
index 559d0850b7..a8ea31bcb3 100644
--- a/src/mc/mc_server.h
+++ b/src/mc/mc_server.h
@@ -17,20 +17,6 @@ typedef struct s_mc_server s_mc_server_t, *mc_server_t;
 
 extern mc_server_t mc_server;
 
-/** Initialise MC server
- *
- * @param  PID of the model-checked process
- * @param socket file descriptor for communication with the model-checked process
- * @return 0 on success
- */
-int MC_server_init(pid_t pid, int socket);
-
-/** Execute the MC server
- *
- *  @return Status code (can be used with `exit()`)
- */
-void MC_server_run(void);
-
 SG_END_DECL()
 
 #ifdef __cplusplus
diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 982bd8e73c..0f3447709f 100644
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -4,6 +4,8 @@
 /* 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. */
 
+#include <exception>
+
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
@@ -67,11 +69,21 @@ static int do_child(int socket, char** argv)
 static int do_parent(int socket, pid_t child)
 {
   XBT_DEBUG("Inside the parent process");
-  if (MC_server_init(child, socket))
-    return MC_SERVER_ERROR;
-  XBT_DEBUG("Server initialized");
-  MC_server_run();
-  return 0;
+  if (mc_server)
+    xbt_die("MC server already present");
+  try {
+    mc_mode = MC_MODE_SERVER;
+    mc_server = new s_mc_server(child, socket);
+    mc_server->start();
+    mc_server->resume(&mc_model_checker->process);
+    mc_server->loop();
+    mc_server->shutdown();
+    mc_server->exit();
+  }
+  catch(std::exception& e) {
+    XBT_ERROR(e.what());
+  }
+  exit(MC_SERVER_ERROR);
 }
 
 static char** argvdup(int argc, char** argv)
-- 
2.20.1