[mc] Remove mc_interface.h

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index ee2fc7c..10ae1ba 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -619,7 +619,6 @@ set(MC_SRC
   src/mc/mc_dwarf_tagnames.h
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.cpp
-  src/mc/mc_interface.h
   src/mc/mc_liveness.h
   src/mc/mc_location.h
   src/mc/mc_liveness.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 45a1b98..693f4f5 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -12,6 +12,7 @@
 #include "../simix/smx_private.h"
 #include "mc/mc_record.h"
 #include "mc/mc_replay.h"
+#include "mc/mc.h"
 
 #ifdef HAVE_MC
 #include "mc_process.h"

diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index 3ba15f6..55a3a75 100644 (file)
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -9,7 +9,6 @@
 
 #include <xbt/misc.h>
 #include <mc/datatypes.h>
-#include "mc_interface.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_interface.h b/src/mc/mc_interface.h
deleted file mode 100644 (file)
index 0bf35d0..0000000
--- a/src/mc/mc_interface.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MC interface: definitions that non-MC modules must see, but not the user */
-
-/* Copyright (c) 2007-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. */
-
-#ifndef MC_INTERFACE_H
-#define MC_INTERFACE_H
-#include "mc/mc.h"
-
-SG_BEGIN_DECL()
-
-typedef struct s_mc_snapshot s_mc_snapshot_t, *mc_snapshot_t;
-
-SG_END_DECL()
-
-#endif

diff --git a/src/mc/mc_location.h b/src/mc/mc_location.h
index 5c450ca..4f07cb8 100644 (file)
--- a/src/mc/mc_location.h
+++ b/src/mc/mc_location.h
@@ -14,7 +14,7 @@
 #include <elfutils/libdw.h>
 
 #include <simgrid_config.h>
-#include "mc_interface.h"
+#include "mc_forward.h"
 #include "mc_object_info.h"
 #include "mc_forward.h"
 #include "mc_address_space.h"

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index cf5aefb..30ea2e7 100644 (file)
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -11,7 +11,6 @@
 #include <sys/types.h>
 
 #include "simgrid_config.h"
-
 #include <sys/types.h>
 
 #include <xbt/mmalloc.h>
@@ -20,6 +19,7 @@
 #include "xbt/mmalloc/mmprivate.h"
 #endif
 
+#include <simgrid/simix.h>
 #include "simix/popping_private.h"
 #include "simix/smx_private.h"
 

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 52ca5da..0c82769 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -11,7 +11,7 @@
 
 #include <simgrid_config.h>
 #include <xbt/dict.h>
-#include "mc_interface.h"
+#include "mc_forward.h"
 #include "mc_state.h"
 
 SG_BEGIN_DECL()

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index 17ff1ba..4ed7355 100644 (file)
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -12,9 +12,10 @@
 
 #include "mc/mc_replay.h"
 #include "smx_private.h"
-#include "mc/mc_interface.h"
+#include "mc/mc_forward.h"
 #include "xbt/ex.h"
 #include <math.h>         /* isfinite() */
+#include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 

diff --git a/src/simix/popping_bodies.c b/src/simix/popping_bodies.c
index 0b413a2..4169dbd 100644 (file)
--- a/src/simix/popping_bodies.c
+++ b/src/simix/popping_bodies.c
@@ -14,7 +14,7 @@
  */
 
 #include "smx_private.h"
-#include "mc/mc_interface.h"
+#include "mc/mc_forward.h"
 #include "xbt/ex.h"
   
 inline static smx_host_t simcall_BODY_host_get_by_name(const char* name) {

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 8eefe72..dc8c59d 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -13,7 +13,7 @@ SG_BEGIN_DECL()
 XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
 
 #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
-#include "mc/mc_interface.h" /* Definition of mc_snapshot_t, used by one simcall */
+#include "mc/mc_forward.h" /* Definition of mc_snapshot_t, used by one simcall */
 
 typedef int (*simix_match_func_t)(void *, void *, smx_synchro_t);
 typedef void (*simix_copy_data_func_t)(smx_synchro_t, void*, size_t);

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 321a63b..efdd044 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -334,7 +334,7 @@ if __name__=='__main__':
   ###
   fd = header('popping_bodies.c')
   fd.write('#include "smx_private.h"\n')
-  fd.write('#include "mc/mc_interface.h"\n')
+  fd.write('#include "mc/mc_forward.h"\n')
   fd.write('#include "xbt/ex.h"\n')
   handle(fd, Simcall.body, simcalls, simcalls_dict)
   fd.close()