mc: kill some useless includes

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 8866abb..26ec1db 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -3,8 +3,6 @@
 /* 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 <cassert>
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -20,15 +18,11 @@
 
 #include "simgrid/sg_config.hpp"
 
-#include "src/mc/ModelChecker.hpp"
 #include "src/mc/Transition.hpp"
 #include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_exit.hpp"
 #include "src/mc/mc_private.hpp"
-#include "src/mc/mc_record.hpp"
 #include "src/mc/remote/RemoteClient.hpp"
-#include "src/mc/remote/mc_protocol.h"
-#include "src/mc/sosp/PageStore.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 

diff --git a/src/mc/sosp/ChunkedData.cpp b/src/mc/sosp/ChunkedData.cpp
index 1c1227e..2d59799 100644 (file)
--- a/src/mc/sosp/ChunkedData.cpp
+++ b/src/mc/sosp/ChunkedData.cpp
@@ -3,17 +3,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 <cstddef>
-#include <cstdint>
-
-#include <vector>
-
-#include "xbt/asserts.h"
-#include "xbt/misc.h"
-
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/sosp/ChunkedData.hpp"
-#include "src/mc/sosp/PageStore.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/sosp/ChunkedData.hpp b/src/mc/sosp/ChunkedData.hpp
index da5854e..33f71a5 100644 (file)
--- a/src/mc/sosp/ChunkedData.hpp
+++ b/src/mc/sosp/ChunkedData.hpp
@@ -6,10 +6,6 @@
 #ifndef SIMGRID_MC_CHUNKED_DATA_HPP
 #define SIMGRID_MC_CHUNKED_DATA_HPP
 
-#include <cstddef>
-#include <cstdint>
-
-#include <utility>
 #include <vector>
 
 #include "src/mc/mc_forward.hpp"

diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp
index bc10291..98c9308 100644 (file)
--- a/src/mc/sosp/PageStore.cpp
+++ b/src/mc/sosp/PageStore.cpp
@@ -3,24 +3,20 @@
 /* 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 <cstring> // memcpy, memcmp
-#include <unistd.h>
-
 #include <sys/mman.h>
 #ifdef __FreeBSD__
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-#include "xbt/base.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 
-#include "src/internal_config.h"
-
 #include "src/mc/sosp/PageStore.hpp"
-
 #include "src/mc/mc_mmu.hpp"
 
+#include <cstring> // memcpy, memcmp
+#include <unistd.h>
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot");
 
 namespace simgrid {

diff --git a/src/mc/sosp/PageStore.hpp b/src/mc/sosp/PageStore.hpp
index 0849366..c78f575 100644 (file)
--- a/src/mc/sosp/PageStore.hpp
+++ b/src/mc/sosp/PageStore.hpp
@@ -6,14 +6,12 @@
 #ifndef SIMGRID_MC_PAGESTORE_HPP
 #define SIMGRID_MC_PAGESTORE_HPP
 
-#include <cstdint>
-#include <vector>
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_mmu.hpp"
 
 #include <unordered_map>
 #include <unordered_set>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/mc_mmu.hpp"
+#include <vector>
 
 #ifndef XBT_ALWAYS_INLINE
 #define XBT_ALWAYS_INLINE inline __attribute__((always_inline))

diff --git a/src/mc/sosp/RegionSnapshot.cpp b/src/mc/sosp/RegionSnapshot.cpp
index 13d6c5b..99c65f7 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.cpp
+++ b/src/mc/sosp/RegionSnapshot.cpp
@@ -10,12 +10,11 @@
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
-#include "mc/mc.h"
+#include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_config.hpp"
-#include "src/mc/sosp/mc_snapshot.hpp"
+#include "src/mc/mc_forward.hpp"
 
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/sosp/ChunkedData.hpp"
 #include "src/mc/sosp/RegionSnapshot.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc, "Logging specific to region snapshots");

diff --git a/src/mc/sosp/RegionSnapshot.hpp b/src/mc/sosp/RegionSnapshot.hpp
index 2284ffa..8d7fa82 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.hpp
+++ b/src/mc/sosp/RegionSnapshot.hpp
@@ -6,19 +6,10 @@
 #ifndef SIMGRID_MC_REGION_SNAPSHOT_HPP
 #define SIMGRID_MC_REGION_SNAPSHOT_HPP
 
-#include <cstddef>
-#include <utility>
+#include "src/mc/sosp/ChunkedData.hpp"
 
-#include <memory>
 #include <vector>
 
-#include "xbt/base.h"
-
-#include "src/mc/AddressSpace.hpp"
-#include "src/mc/remote/RemotePtr.hpp"
-#include "src/mc/sosp/ChunkedData.hpp"
-#include "src/mc/sosp/PageStore.hpp"
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/sosp/mc_checkpoint.cpp b/src/mc/sosp/mc_checkpoint.cpp
index 1b1ff78..e653d30 100644 (file)
--- a/src/mc/sosp/mc_checkpoint.cpp
+++ b/src/mc/sosp/mc_checkpoint.cpp
@@ -3,38 +3,18 @@
 /* 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 <unistd.h>
-
 #ifndef WIN32
 #include <sys/mman.h>
 #endif
 
-#include "src/internal_config.h"
-#include "src/mc/mc_private.hpp"
-#include "src/smpi/include/private.hpp"
 #include "xbt/file.hpp"
-#include "xbt/mmalloc.h"
-#include "xbt/module.h"
-
-#include "src/xbt/mmalloc/mmprivate.h"
-
-#include "src/simix/smx_private.hpp"
-
-#include <libelf.h>
-#include <libunwind.h>
-
-#include "src/mc/mc_private.hpp"
-#include <mc/mc.h>
 
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_hash.hpp"
-#include "src/mc/mc_mmu.hpp"
+#include "src/mc/mc_private.hpp"
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/remote/mc_protocol.h"
 #include "src/mc/sosp/mc_snapshot.hpp"
 
-#include "src/mc/sosp/RegionSnapshot.hpp"
-
 using simgrid::mc::remote;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint");