Move xbt_modinter.h to src/include/xbt/.

diff --git a/MANIFEST.in b/MANIFEST.in
index bb5203c..d97b8e5 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2117,6 +2117,7 @@ include src/include/surf/surf.hpp
 include src/include/xbt/coverage.h
 include src/include/xbt/mmalloc.h
 include src/include/xbt/parmap.hpp
+include src/include/xbt/xbt_modinter.h
 include src/include/xxhash.hpp
 include src/instr/instr_config.cpp
 include src/instr/instr_interface.cpp
@@ -2635,7 +2636,6 @@ include src/xbt/xbt_replay.cpp
 include src/xbt/xbt_str.cpp
 include src/xbt/xbt_str_test.cpp
 include src/xbt/xbt_virtu.cpp
-include src/xbt_modinter.h
 include teshsuite/java/CMakeLists.txt
 include teshsuite/kernel/CMakeLists.txt
 include teshsuite/lua/CMakeLists.txt

diff --git a/src/xbt_modinter.h b/src/include/xbt/xbt_modinter.h
similarity index 95%
rename from src/xbt_modinter.h
rename to src/include/xbt/xbt_modinter.h
index e746052..a9473cf 100644 (file)
--- a/src/xbt_modinter.h
+++ b/src/include/xbt/xbt_modinter.h
@@ -19,7 +19,7 @@ void xbt_log_postexit(void);
 void xbt_dict_preinit(void);
 void xbt_dict_postexit(void);
 
-void *mmalloc_preinit(void);
+void* mmalloc_preinit(void);
 void mmalloc_postexit(void);
 
 extern int xbt_initialized;

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index f329df4..ee7ba98 100644 (file)
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -8,8 +8,8 @@
 #include "simgrid/Exception.hpp"
 #include "src/internal_config.h" /* loads context system definitions */
 #include "src/simix/smx_private.hpp"
-#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
 #include "xbt/function_types.h"
+#include "xbt/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
 
 #include <boost/core/demangle.hpp>
 #include <functional>

diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp
index ad2b462..abf4c25 100644 (file)
--- a/src/mc/remote/AppSide.cpp
+++ b/src/mc/remote/AppSide.cpp
@@ -8,7 +8,7 @@
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
 #include "src/mc/remote/RemoteProcess.hpp"
-#include "src/xbt_modinter.h" /* mmalloc_preinit to get the default mmalloc arena address */
+#include "xbt/xbt_modinter.h" /* mmalloc_preinit to get the default mmalloc arena address */
 #include <simgrid/modelchecker.h>
 
 #include <cerrno>

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index ba953e9..4eec01a 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -11,9 +11,9 @@
 #include "src/kernel/resource/profile/Profile.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/xml/platf.hpp"
-#include "src/xbt_modinter.h" /* whether initialization was already done */
 #include "surf/surf.hpp"
 #include "xbt/module.h"
+#include "xbt/xbt_modinter.h" /* whether initialization was already done */
 
 #include <fstream>
 #include <string>

diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp
index 7fc4593..7a22a96 100644 (file)
--- a/src/xbt/dict.cpp
+++ b/src/xbt/dict.cpp
@@ -8,12 +8,12 @@
 #include "xbt/dict.h"
 #include "dict_private.h"
 #include "simgrid/Exception.hpp"
-#include "src/xbt_modinter.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
 #include "xbt/str.h"
 #include "xbt/string.hpp"
+#include "xbt/xbt_modinter.h"
 
 #include <cstdio>
 #include <cstring>

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index e9c1701..1dab66e 100644 (file)
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -6,9 +6,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/xbt/log_private.hpp"
-#include "src/xbt_modinter.h"
 #include "xbt/asserts.h"
 #include "xbt/string.hpp"
+#include "xbt/xbt_modinter.h"
 
 #include <algorithm>
 #include <array>

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 7ab16fd..f5b05ad 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -14,7 +14,7 @@
 #include "mmprivate.h"
 #include "src/internal_config.h"
 #include "src/mc/remote/mc_protocol.h"
-#include "src/xbt_modinter.h"
+#include "xbt/xbt_modinter.h"
 #include <math.h>
 
 /* ***** Whether to use `mmalloc` of the underlying malloc ***** */

diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index 1a28bd4..4a1f603 100644 (file)
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -37,7 +37,7 @@
 #endif
 #include "mmprivate.h"
 #include "xbt/ex.h"
-#include "src/xbt_modinter.h" /* declarations of mmalloc_preinit and friends that live here */
+#include "xbt/xbt_modinter.h" /* declarations of mmalloc_preinit and friends that live here */
 
 #ifndef SEEK_SET
 #define SEEK_SET 0

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index f59533e..9058e51 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -10,7 +10,6 @@
 #include "simgrid/config.h"
 #include "simgrid/sg_config.hpp"
 #include "src/internal_config.h"
-#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
 #include "xbt/config.hpp"
 #include "xbt/coverage.h"
 #include "xbt/dynar.h"
@@ -19,6 +18,7 @@
 #include "xbt/misc.h"
 #include "xbt/module.h" /* this module */
 #include "xbt/sysdep.h"
+#include "xbt/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
 
 #include <cmath>
 #include <cstdio>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 50b965c..3007a3a 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -10,6 +10,7 @@ set(EXTRA_DIST
   src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
   src/include/xbt/mmalloc.h
+  src/include/xbt/xbt_modinter.h
   src/include/catch.hpp
   src/include/xxhash.hpp
   src/mc/mc_mmu.hpp
@@ -290,7 +291,6 @@ set(XBT_SRC
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
   src/xbt/xbt_virtu.cpp
-  src/xbt_modinter.h
   )
 
 if(HAVE_MMALLOC)