Remove some #include

Trying to speed up partial recompilations.

diff --git a/examples/smpi/MM/MM_mpi.c b/examples/smpi/MM/MM_mpi.c
index d59b122..ecaab74 100644 (file)
--- a/examples/smpi/MM/MM_mpi.c
+++ b/examples/smpi/MM/MM_mpi.c
@@ -9,10 +9,10 @@
  *
  */
 
-
 #include "Matrix_init.h"
 #include "2.5D_MM.h"
 #include "xbt/log.h"
+#include <xbt/str.h>
 
 /*int sched_setaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *mask);
   int sched_getaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *mask);

diff --git a/examples/smpi/mvmul.c b/examples/smpi/mvmul.c
index c7e8353..acc6af8 100644 (file)
--- a/examples/smpi/mvmul.c
+++ b/examples/smpi/mvmul.c
@@ -9,6 +9,8 @@
 #include <ctype.h>
 #include <mpi.h>
 
+#include <xbt/str.h>
+
 #define ITERATIONS         10
 
 #define USAGE_ERROR        1

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index 4015e9a..b77f417 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -18,8 +18,9 @@
 #include <stdbool.h>
 
 #include <simgrid_config.h> /* HAVE_MC ? */
-#include <xbt.h>
-#include "xbt/automaton.h"
+
+#include <xbt/base.h>
+#include <xbt/automaton.h>
 
 SG_BEGIN_DECL()
 

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 82a1146..401969f 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -7,30 +7,23 @@
 #ifndef MC_DATATYPE_H
 #define MC_DATATYPE_H
 
+#include <simgrid_config.h>
+#include <xbt/base.h>
+
 #ifdef _XBT_WIN32
 #  include <xbt/win32_ucontext.h>     /* context relative declarations */
 #else
 #  include <ucontext.h>           /* context relative declarations */
 #endif
 
-
-#include "xbt/misc.h"
-#include "xbt/swag.h"
-#include "xbt/fifo.h"
-
 #if HAVE_MC
-#include <libunwind.h>
 #include <dwarf.h>
 #endif 
 
 SG_BEGIN_DECL()
 
-/******************************* Transitions **********************************/
-
 typedef struct s_mc_transition *mc_transition_t;
 
-/*********** Structures for snapshot comparison **************************/
-
 typedef struct s_stack_region{
   void *address;
   ucontext_t* context;
@@ -39,7 +32,6 @@ typedef struct s_stack_region{
   int process_index;
 }s_stack_region_t, *stack_region_t;
 
-/************ DWARF structures *************/
-
 SG_END_DECL()
+
 #endif                          /* _MC_MC_H */

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 606538a..00d6eb8 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,23 +7,18 @@
 #ifndef _MC_MC_H
 #define _MC_MC_H
 
+#include <simgrid_config.h>
+#include <xbt/base.h>
+#include <xbt/misc.h>
+#include <simgrid/simix.h>
+#include <simgrid/modelchecker.h> /* our public interface (and definition of HAVE_MC) */
+
 #ifdef _XBT_WIN32
 #  include <xbt/win32_ucontext.h>     /* context relative declarations */
 #else
 #  include <ucontext.h>           /* context relative declarations */
 #endif
 
-
-#include "xbt/base.h"
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "simgrid/simix.h"
-#include "simgrid/modelchecker.h" /* our public interface (and definition of HAVE_MC) */
-#include "xbt/automaton.h"
-#include "xbt/dynar.h"
-
 /* Maximum size of the application heap.
  *
  * The model-checker heap is placed at this offset from the

diff --git a/src/mc/ChunkedData.cpp b/src/mc/ChunkedData.cpp
index 00f6e31..8a5d334 100644 (file)
--- a/src/mc/ChunkedData.cpp
+++ b/src/mc/ChunkedData.cpp
@@ -4,7 +4,15 @@
 /* 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/misc.h>
+#include <xbt/asserts.h>
+
+#include "src/mc/AddressSpace.hpp"
 #include "src/mc/ChunkedData.hpp"
 
 #define SOFT_DIRTY_BIT_NUMBER 55

diff --git a/src/mc/ChunkedData.hpp b/src/mc/ChunkedData.hpp
index bd35e3b..20711df 100644 (file)
--- a/src/mc/ChunkedData.hpp
+++ b/src/mc/ChunkedData.hpp
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 
+#include <utility>
 #include <vector>
 
 #include "src/mc/mc_forward.hpp"

diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp
index 6c90f31..35017da 100644 (file)
--- a/src/mc/DwarfExpression.cpp
+++ b/src/mc/DwarfExpression.cpp
@@ -4,13 +4,12 @@
 /* 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 <cstdarg>
 
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/LocationList.hpp"
 #include "src/mc/AddressSpace.hpp"

diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index fda5c6a..5063a44 100644 (file)
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -9,9 +9,14 @@
 
 #include <cstdint>
 #include <cstdlib>
+
 #include <stdexcept>
+#include <utility>
+#include <vector>
+
+#include <elfutils/libdw.h>
 
-#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_forward.hpp"
 
 /** @file DwarfExession.hpp
  *

diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index 2e269d3..eb5ff10 100644 (file)
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -8,6 +8,7 @@
 #define SIMGRID_MC_FRAME_HPP
 
 #include <string>
+#include <cstdint>
 
 #include <xbt/base.h>
 #include <xbt/range.hpp>

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index 57326a0..2a8bdba 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -15,9 +15,9 @@
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
+#include <xbt/base.h>
 #include <xbt/range.hpp>
 
-#include "simgrid_config.h"
 #include "src/mc/mc_base.h"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/AddressSpace.hpp"

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index fa1fca1..0cd5848 100644 (file)
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -7,12 +7,8 @@
 #ifndef SIMGRID_MC_BASE_H
 #define SIMGRID_MC_BASE_H
 
-#include <xbt/misc.h>
-#include <simgrid/simix.h>
-#include "simgrid_config.h"
-#include "src/internal_config.h"
-#include "src/simix/smx_private.h"
-#include "mc/mc.h"
+#include <xbt/base.h>
+#include "src/simix/popping_private.h" // smx_simcall_t
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index cf124de..19fb550 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -28,7 +28,6 @@
 #include <mc/mc.h>
 
 #include "src/mc/mc_snapshot.h"
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_mmu.h"
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_protocol.h"

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index dd6dd27..ca498ee 100644 (file)
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -13,7 +13,6 @@
 #include <xbt/sysdep.h>
 
 #include "src/internal_config.h"
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_safety.h"
 #include "src/mc/mc_liveness.h"
 #include "src/mc/mc_private.h"

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index f8bbd84..17f3569 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -10,7 +10,6 @@
 #include "xbt/str.h"
 #include "mc/mc.h"
 #include "xbt/mmalloc.h"
-#include "src/mc/mc_object_info.h"
 #include "mc/datatypes.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_snapshot.h"

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index 740506a..54d49c6 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -20,10 +20,10 @@
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_dwarf.hpp"
 
+#include "src/mc/mc_object_info.h"
 #include "src/mc/Process.hpp"
 #include "src/mc/ObjectInformation.hpp"
 #include "src/mc/Variable.hpp"

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 868329c..d692f5e 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -5,11 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <cinttypes>
-
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
-#include <cstring>
 
 #include "mc_base.h"
 
@@ -19,19 +17,11 @@
 #include <sys/time.h>
 #endif
 
-#include "simgrid/sg_config.h"
-#include "src/surf/surf_private.h"
-#include "src/simix/smx_private.h"
-#include "xbt/fifo.h"
-#include "xbt/automaton.h"
-#include "xbt/dict.h"
-#include "mc_record.h"
+#include <xbt/fifo.h>
+#include <xbt/automaton.h>
 
 #ifdef HAVE_MC
 #include <libunwind.h>
-#include <xbt/mmalloc.h>
-#include "src/xbt/mmalloc/mmprivate.h"
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_request.h"
 #include "src/mc/mc_safety.h"
@@ -41,6 +31,7 @@
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_smx.h"
 #endif
+
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_protocol.h"
 #include "src/mc/mc_client.h"

diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index 6017779..5a440b5 100644 (file)
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/internal_config.h"
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_private.h"
 #include "src/smpi/private.h"
 #include "src/mc/mc_snapshot.h"

diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp
index 683f82f..e709912 100644 (file)
--- a/src/mc/mc_member.cpp
+++ b/src/mc/mc_member.cpp
@@ -6,7 +6,6 @@
 
 #include <xbt/misc.h>
 
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/Type.hpp"
 #include "src/mc/mc_dwarf.hpp"

diff --git a/src/mc/mc_memory.cpp b/src/mc/mc_memory.cpp
index 5594edc..7cc36bd 100644 (file)
--- a/src/mc/mc_memory.cpp
+++ b/src/mc/mc_memory.cpp
@@ -12,7 +12,6 @@
 #include "xbt/virtu.h"
 
 #include "mc/mc.h"
-#include "src/mc/mc_object_info.h"
 #include "src/mc/mc_private.h"
 
 extern "C" {

diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h
index 64b0e70..5858f54 100644 (file)
--- a/src/mc/mc_protocol.h
+++ b/src/mc/mc_protocol.h
@@ -7,6 +7,8 @@
 #ifndef SIMGRID_MC_PROTOCOL_H
 #define SIMGRID_MC_PROTOCOL_H
 
+#include <stdint.h>
+
 #include <xbt/misc.h>
 
 #include "mc/datatypes.h"

diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index 2939b6a..b050ee5 100644 (file)
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 
-#include "simgrid_config.h"
+#include <xbt/base.h>
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp
index bb6053a..3b71d12 100644 (file)
--- a/src/mc/mc_unw.cpp
+++ b/src/mc/mc_unw.cpp
@@ -18,7 +18,6 @@
 
 #include <libunwind.h>
 
-#include "src/mc/mc_object_info.h"
 #include "src/mc/Process.hpp"
 #include "src/mc/mc_unw.h"
 #include "src/mc/Frame.hpp"

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index c563ac8..0d5427b 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -8,6 +8,7 @@
 #define _POPPING_PRIVATE_H
 
 #include <xbt/base.h>
+#include <simgrid/simix.h>
 
 SG_BEGIN_DECL()