From f0527e5764cc4d3d4938180a54b7fee812444209 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 6 Feb 2015 10:52:48 +0100
Subject: [PATCH] [mc] Move mc_model_checker in its own .c file

---
 buildtools/Cmake/DefinePackages.cmake |  1 +
 src/mc/mc_global.c                    | 20 -------------------
 src/mc/mc_model_checker.c             | 28 +++++++++++++++++++++++++++
 src/mc/mc_model_checker.h             |  1 +
 4 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 src/mc/mc_model_checker.c

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 4f69a870b5..64e279fa49 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -604,6 +604,7 @@ set(MC_SRC
   src/mc/mc_unw_vmread.c
   src/mc/mc_mmalloc.h
   src/mc/mc_model_checker.h
+  src/mc/mc_model_checker.c
   src/mc/mc_object_info.h
   src/mc/mc_object_info.c
   src/mc/mc_checkpoint.c
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 3b1367023b..52848e6005 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -99,26 +99,6 @@ static void MC_init_dot_output()
 
 }
 
-mc_model_checker_t mc_model_checker = NULL;
-
-mc_model_checker_t MC_model_checker_new(pid_t pid, int socket)
-{
-  mc_model_checker_t mc = xbt_new0(s_mc_model_checker_t, 1);
-  mc->pages = mc_pages_store_new();
-  mc->fd_clear_refs = -1;
-  mc->fd_pagemap = -1;
-  MC_process_init(&mc->process, pid, socket);
-  return mc;
-}
-
-void MC_model_checker_delete(mc_model_checker_t mc)
-{
-  mc_pages_store_delete(mc->pages);
-  if(mc->record)
-    xbt_dynar_free(&mc->record);
-  MC_process_clear(&mc->process);
-}
-
 void MC_init()
 {
   MC_init_pid(getpid(), -1);
diff --git a/src/mc/mc_model_checker.c b/src/mc/mc_model_checker.c
new file mode 100644
index 0000000000..e3cc96165c
--- /dev/null
+++ b/src/mc/mc_model_checker.c
@@ -0,0 +1,28 @@
+/* Copyright (c) 2008-2014. 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. */
+
+#include "mc_model_checker.h"
+#include "mc_page_store.h"
+
+mc_model_checker_t mc_model_checker = NULL;
+
+mc_model_checker_t MC_model_checker_new(pid_t pid, int socket)
+{
+  mc_model_checker_t mc = xbt_new0(s_mc_model_checker_t, 1);
+  mc->pages = mc_pages_store_new();
+  mc->fd_clear_refs = -1;
+  mc->fd_pagemap = -1;
+  MC_process_init(&mc->process, pid, socket);
+  return mc;
+}
+
+void MC_model_checker_delete(mc_model_checker_t mc)
+{
+  mc_pages_store_delete(mc->pages);
+  if(mc->record)
+    xbt_dynar_free(&mc->record);
+  MC_process_clear(&mc->process);
+}
diff --git a/src/mc/mc_model_checker.h b/src/mc/mc_model_checker.h
index d590e0fc28..e8e7c8274e 100644
--- a/src/mc/mc_model_checker.h
+++ b/src/mc/mc_model_checker.h
@@ -13,6 +13,7 @@
 
 #include "mc_forward.h"
 #include "mc_process.h"
+#include "mc_page_store.h"
 
 SG_BEGIN_DECL()
 
-- 
2.20.1