[mc] Better #includes

Use "#include src/mc/foo" instead of "#include foo"

diff --git a/src/mc/AddressSpace.cpp b/src/mc/AddressSpace.cpp
index 7050e2a..e84bac2 100644 (file)
--- a/src/mc/AddressSpace.cpp
+++ b/src/mc/AddressSpace.cpp
@@ -4,7 +4,7 @@
 /* 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 "AddressSpace.hpp"
+#include "src/mc/AddressSpace.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index 6aed5ea..5b55a31 100644 (file)
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.hpp
@@ -13,7 +13,7 @@
 
 #include <xbt/misc.h>
 
-#include "mc_forward.hpp"
+#include "src/mc/mc_forward.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp
index 472a2a5..ecedcb2 100644 (file)
--- a/src/mc/DwarfExpression.cpp
+++ b/src/mc/DwarfExpression.cpp
@@ -10,14 +10,14 @@
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 
-#include "mc_object_info.h"
-#include "mc_private.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
 #include "src/mc/LocationList.hpp"
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/Frame.hpp"
 #include "src/mc/ObjectInformation.hpp"
 #include "src/mc/DwarfExpression.hpp"
-#include "mc_dwarf.hpp"
+#include "src/mc/mc_dwarf.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index 77fcc05..ee39960 100644 (file)
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -11,7 +11,7 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "src/mc/LocationList.hpp"
 #include "src/mc/Variable.hpp"
 #include "src/mc/Frame.hpp"

diff --git a/src/mc/LocationList.cpp b/src/mc/LocationList.cpp
index f11ea28..652d3f0 100644 (file)
--- a/src/mc/LocationList.cpp
+++ b/src/mc/LocationList.cpp
@@ -4,7 +4,7 @@
 /* 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_dwarf.hpp"
+#include "src/mc/mc_dwarf.hpp"
 #include "src/mc/ObjectInformation.hpp"
 #include "src/mc/LocationList.hpp"
 

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index e23ba40..c5c186f 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -16,8 +16,8 @@
 #include <elfutils/libdw.h>
 
 #include "simgrid_config.h"
-#include "mc_base.h"
-#include "mc_forward.hpp"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_forward.hpp"
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/DwarfExpression.hpp"
 

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 4d2b523..5c947d2 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -22,13 +22,13 @@
 
 #include "simgrid/sg_config.h"
 
-#include "ModelChecker.hpp"
-#include "PageStore.hpp"
-#include "ModelChecker.hpp"
-#include "mc_protocol.h"
-#include "mc_private.h"
-#include "mc_ignore.h"
-#include "mc_exit.h"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_exit.h"
 #include "src/mc/mc_liveness.h"
 
 extern "C" {

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index ee1a955..75b2f5d 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -17,10 +17,10 @@
 #include <xbt/base.h>
 #include <sys/types.h>
 
-#include "mc_forward.hpp"
+#include "src/mc/mc_forward.hpp"
 #include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp
index 88ea806..403ef31 100644 (file)
--- a/src/mc/PageStore.cpp
+++ b/src/mc/PageStore.cpp
@@ -11,9 +11,9 @@
 
 #include <xbt.h>
 
-#include "PageStore.hpp"
+#include "src/mc/PageStore.hpp"
 
-#include "mc_mmu.h"
+#include "src/mc/mc_mmu.h"
 
 extern "C" {
 

diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp
index 36c90d0..8ed78ad 100644 (file)
--- a/src/mc/PageStore.hpp
+++ b/src/mc/PageStore.hpp
@@ -15,8 +15,8 @@
 
 #include <xbt/base.h>
 
-#include "mc_mmu.h"
-#include "mc_forward.hpp"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/mc_forward.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index f90af18..d7e12bf 100644 (file)
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -27,11 +27,11 @@
 
 #include <xbt/mmalloc.h>
 
-#include "mc_object_info.h"
-#include "mc_unw.h"
-#include "mc_snapshot.h"
-#include "mc_ignore.h"
-#include "mc_smx.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_smx.h"
 
 #include "src/mc/Process.hpp"
 #include "src/mc/AddressSpace.hpp"

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index ab4eaea..2f51240 100644 (file)
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -30,13 +30,12 @@
 
 #include "src/xbt/memory_map.hpp"
 
-#include "mc_forward.hpp"
-#include "mc_base.h"
-#include "mc_mmalloc.h" // std_heap
-#include "AddressSpace.hpp"
-#include "mc_protocol.h"
-
-#include "ObjectInformation.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_mmalloc.h" // std_heap
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/ObjectInformation.hpp"
 
 // Those flags are used to track down which cached information
 // is still up to date and which information needs to be updated.

diff --git a/src/mc/RegionSnapshot.cpp b/src/mc/RegionSnapshot.cpp
index 007fcd0..d3f49de 100644 (file)
--- a/src/mc/RegionSnapshot.cpp
+++ b/src/mc/RegionSnapshot.cpp
@@ -7,7 +7,7 @@
 #include <sys/mman.h>
 
 #include "mc/mc.h"
-#include "mc_snapshot.h"
+#include "src/mc/mc_snapshot.h"
 
 #include "src/mc/ChunkedData.hpp"
 #include "src/mc/RegionSnapshot.hpp"

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index a3bffd5..819cf81 100644 (file)
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -12,7 +12,7 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "src/mc/LocationList.hpp"
 
 namespace simgrid {

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 176cf46..5ca55ab 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -11,7 +11,7 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "src/mc/LocationList.hpp"
 
 namespace simgrid {

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 5a7f2f8..d7cf4eb 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -8,17 +8,17 @@
 
 #include <simgrid/simix.h>
 
-#include "mc_base.h"
+#include "src/mc/mc_base.h"
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_replay.h"
 #include "mc/mc.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 #ifdef HAVE_MC
 #include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 #endif
 
 #ifdef HAVE_MC

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 6bafeae..9aa90a6 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -11,7 +11,7 @@
 #include <dirent.h>
 
 #include "src/internal_config.h"
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
 #include "xbt/module.h"
 #include <xbt/mmalloc.h>
 #include "src/smpi/private.h"
@@ -24,15 +24,15 @@
 #include <libunwind.h>
 #include <libelf.h>
 
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
 #include <mc/mc.h>
 
-#include "mc_snapshot.h"
-#include "mc_object_info.h"
-#include "mc_mmu.h"
-#include "mc_unw.h"
-#include "mc_protocol.h"
-#include "mc_smx.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"
+#include "src/mc/mc_smx.h"
 #include "mc_hash.hpp"
 
 #include "src/mc/ObjectInformation.hpp"

diff --git a/src/mc/mc_client.cpp b/src/mc/mc_client.cpp
index 12edc6b..3956391 100644 (file)
--- a/src/mc/mc_client.cpp
+++ b/src/mc/mc_client.cpp
@@ -15,14 +15,14 @@
 #include <xbt/sysdep.h>
 #include <xbt/mmalloc.h>
 
-#include "mc_protocol.h"
-#include "mc_client.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 
 // We won't need those once the separation MCer/MCed is complete:
-#include "mc_mmalloc.h"
-#include "mc_ignore.h"
-#include "mc_private.h" // MC_deadlock_check()
-#include "mc_smx.h"
+#include "src/mc/mc_mmalloc.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_private.h" // MC_deadlock_check()
+#include "src/mc/mc_smx.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_client.h b/src/mc/mc_client.h
index 079c441..6b68dbe 100644 (file)
--- a/src/mc/mc_client.h
+++ b/src/mc/mc_client.h
@@ -8,7 +8,7 @@
 #define SIMGRID_MC_CLIENT_H
 
 #include <xbt/misc.h>
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 372f3c4..9bbceb0 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -9,13 +9,13 @@
 #include <xbt/sysdep.h>
 #include <simgrid/modelchecker.h>
 
-#include "mc_record.h"
-#include "mc_private.h"
-#include "mc_mmalloc.h"
-#include "mc_ignore.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
-#include "ModelChecker.hpp"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_mmalloc.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/ModelChecker.hpp"
 
 /** \file mc_client_api.cpp
  *

diff --git a/src/mc/mc_comm_determinism.cpp b/src/mc/mc_comm_determinism.cpp
index 019e609..9525f92 100644 (file)
--- a/src/mc/mc_comm_determinism.cpp
+++ b/src/mc/mc_comm_determinism.cpp
@@ -4,15 +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 "mc_state.h"
-#include "mc_comm_pattern.h"
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_private.h"
-#include "mc_record.h"
-#include "mc_smx.h"
-#include "mc_client.h"
-#include "mc_exit.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/mc_exit.h"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index 3bb5deb..d29df34 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -9,9 +9,9 @@
 #include <xbt/sysdep.h>
 #include <xbt/dynar.h>
 
-#include "mc_comm_pattern.h"
-#include "mc_smx.h"
-#include "mc_xbt.hpp"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_xbt.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 285256a..83c386a 100644 (file)
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -16,7 +16,7 @@
 #include "src/smpi/private.h"
 #include <smpi/smpi.h>
 
-#include "mc_state.h"
+#include "src/mc/mc_state.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index ed0d50e..5740b04 100644 (file)
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -13,12 +13,12 @@
 #include <xbt/sysdep.h>
 
 #include "src/internal_config.h"
-#include "mc_object_info.h"
-#include "mc_safety.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_smx.h"
-#include "mc_dwarf.hpp"
+#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"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_dwarf.hpp"
 
 #include "src/mc/Frame.hpp"
 #include "src/mc/ObjectInformation.hpp"

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index b863136..09a1214 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -14,11 +14,11 @@
 #include <simgrid/sg_config.h>
 
 #ifdef HAVE_MC
-#include "mc_safety.h"
-#include "mc_private.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_private.h"
 #endif
 
-#include "mc_record.h"
+#include "src/mc/mc_record.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index f1694c4..d3f2904 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -10,7 +10,7 @@
 #include "xbt/str.h"
 #include "mc/mc.h"
 #include "xbt/mmalloc.h"
-#include "mc_object_info.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 c744d0a..e7a7b6c 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -20,9 +20,9 @@
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 
-#include "mc_object_info.h"
-#include "mc_private.h"
-#include "mc_dwarf.hpp"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_dwarf.hpp"
 
 #include "src/mc/Process.hpp"
 #include "src/mc/ObjectInformation.hpp"

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index dc9b5f8..b1e8b48 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -31,19 +31,19 @@
 #include <libunwind.h>
 #include <xbt/mmalloc.h>
 #include "src/xbt/mmalloc/mmprivate.h"
-#include "mc_object_info.h"
-#include "mc_comm_pattern.h"
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_snapshot.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_unw.h"
-#include "mc_smx.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"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/mc_smx.h"
 #endif
-#include "mc_record.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp
index 7a0249d..ba391fa 100644 (file)
--- a/src/mc/mc_hash.cpp
+++ b/src/mc/mc_hash.cpp
@@ -8,9 +8,9 @@
 
 #include <cstdint>
 
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
 #include "mc/datatypes.h"
-#include "mc_hash.hpp"
+#include "src/mc/mc_hash.hpp"
 #include <mc/mc.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");

diff --git a/src/mc/mc_hash.hpp b/src/mc/mc_hash.hpp
index 4a8dd6a..767fcc0 100644 (file)
--- a/src/mc/mc_hash.hpp
+++ b/src/mc/mc_hash.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "xbt/misc.h"
-#include "mc_snapshot.h"
+#include "src/mc/mc_snapshot.h"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index debb2a4..ccac733 100644 (file)
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -5,13 +5,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/internal_config.h"
-#include "mc_object_info.h"
-#include "mc_private.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"
-#include "mc_ignore.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_liveness.cpp b/src/mc/mc_liveness.cpp
index 7eef307..2bdc1a7 100644 (file)
--- a/src/mc/mc_liveness.cpp
+++ b/src/mc/mc_liveness.cpp
@@ -10,15 +10,15 @@
 #include <xbt/dynar.h>
 #include <xbt/automaton.h>
 
-#include "mc_request.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_record.h"
-#include "mc_smx.h"
-#include "mc_client.h"
-#include "mc_replay.h"
-#include "mc_safety.h"
-#include "mc_exit.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_exit.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_liveness.h b/src/mc/mc_liveness.h
index a72af0c..f33cc54 100644 (file)
--- a/src/mc/mc_liveness.h
+++ b/src/mc/mc_liveness.h
@@ -13,7 +13,7 @@
 #include <xbt/fifo.h>
 #include <xbt/dynar.h>
 #include <xbt/automaton.h>
-#include "mc_state.h"
+#include "src/mc/mc_state.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp
index bbe2eef..0a5040b 100644 (file)
--- a/src/mc/mc_member.cpp
+++ b/src/mc/mc_member.cpp
@@ -6,8 +6,8 @@
 
 #include <xbt/misc.h>
 
-#include "mc_object_info.h"
-#include "mc_private.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_private.h"
 #include "src/mc/Type.hpp"
 
 namespace simgrid {

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

diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index 91d8825..da93084 100644 (file)
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -12,7 +12,7 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.hpp"
+#include "src/mc/mc_forward.hpp"
 #include "src/xbt/memory_map.hpp"
 
 XBT_PRIVATE std::shared_ptr<simgrid::mc::ObjectInformation> MC_find_object_info(

diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp
index 4463448..49986e0 100644 (file)
--- a/src/mc/mc_page_snapshot.cpp
+++ b/src/mc/mc_page_snapshot.cpp
@@ -8,10 +8,10 @@
 
 #include <unistd.h> // pread, pwrite
 
-#include "PageStore.hpp"
-#include "mc_mmu.h"
-#include "mc_private.h"
-#include "mc_snapshot.h"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_snapshot.h"
 
 #include <xbt/mmalloc.h>
 #include "src/mc/ChunkedData.hpp"

diff --git a/src/mc/mc_pair.cpp b/src/mc/mc_pair.cpp
index 12936db..129e69a 100644 (file)
--- a/src/mc/mc_pair.cpp
+++ b/src/mc/mc_pair.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <xbt.h>
-#include "mc_liveness.h"
-#include "mc_private.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 5bd89c1..17982ed 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -19,7 +19,7 @@
 #include <elfutils/libdw.h>
 
 #include "mc/mc.h"
-#include "mc_base.h"
+#include "src/mc/mc_base.h"
 #include "mc/datatypes.h"
 #include "xbt/fifo.h"
 #include "xbt/config.h"
@@ -39,8 +39,8 @@
 #include "xbt/parmap.h"
 #include <xbt/base.h>
 
-#include "mc_forward.h"
-#include "mc_protocol.h"
+#include "src/mc/mc_forward.h"
+#include "src/mc/mc_protocol.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_protocol.cpp b/src/mc/mc_protocol.cpp
index 38c6547..ce70fab 100644 (file)
--- a/src/mc/mc_protocol.cpp
+++ b/src/mc/mc_protocol.cpp
@@ -13,8 +13,8 @@
 
 #include <xbt/log.h>
 
-#include "mc_protocol.h"
-#include "mc_client.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 53fe654..824466a 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -11,15 +11,15 @@
 #include <xbt.h>
 #include <simgrid/simix.h>
 
-#include "mc_replay.h"
-#include "mc_record.h"
-#include "mc_base.h"
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_base.h"
 
 #ifdef HAVE_MC
-#include "mc_private.h"
-#include "mc_state.h"
-#include "mc_smx.h"
-#include "mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_liveness.h"
 #endif
 
 extern "C" {

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index ef553fd..c77bc95 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -6,11 +6,11 @@
 
 #include <assert.h>
 
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_private.h"
-#include "mc_smx.h"
-#include "mc_xbt.hpp"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_xbt.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_safety.cpp b/src/mc/mc_safety.cpp
index 89c7076..1642b3a 100644 (file)
--- a/src/mc/mc_safety.cpp
+++ b/src/mc/mc_safety.cpp
@@ -6,14 +6,14 @@
 
 #include <assert.h>
 
-#include "mc_state.h"
-#include "mc_request.h"
-#include "mc_safety.h"
-#include "mc_private.h"
-#include "mc_record.h"
-#include "mc_smx.h"
-#include "mc_client.h"
-#include "mc_exit.h"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/mc_exit.h"
 
 #include "src/xbt/mmalloc/mmprivate.h"
 

diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index adc9d6a..d6c907d 100644 (file)
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -12,8 +12,8 @@
 #include <simgrid_config.h>
 #include <xbt/base.h>
 #include <xbt/dict.h>
-#include "mc_forward.hpp"
-#include "mc_state.h"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_state.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index ee53d1a..9e95602 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -10,7 +10,7 @@
 
 #include "src/simix/smx_private.h"
 
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 #include "ModelChecker.hpp"
 
 using simgrid::mc::remote;

diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index d94c414..0b8f9cd 100644 (file)
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -15,7 +15,7 @@
 #include "src/smpi/private.h"
 
 #include "src/mc/Process.hpp"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 /** @file
  *  @brief (Cross-process, MCer/MCed) Access to SMX structures

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index e1b67f1..6698e92 100644 (file)
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -9,10 +9,10 @@
 #include "src/internal_config.h"
 #include "src/smpi/private.h"
 
-#include "mc_snapshot.h"
-#include "mc_private.h"
-#include "mc_mmu.h"
-#include "PageStore.hpp"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/PageStore.hpp"
 
 extern "C" {
 

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index fdc74ef..5c638f6 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -20,13 +20,13 @@
 #include <xbt/dynar.h>
 #include <xbt/base.h>
 
-#include "mc_forward.hpp"
-#include "ModelChecker.hpp"
-#include "PageStore.hpp"
-#include "mc_mmalloc.h"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/mc_mmalloc.h"
 #include "src/mc/AddressSpace.hpp"
-#include "mc_unw.h"
-#include "RegionSnapshot.hpp"
+#include "src/mc/mc_unw.h"
+#include "src/mc/RegionSnapshot.hpp"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index ca00fc0..e0e6121 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -8,12 +8,12 @@
 
 #include "src/simix/smx_private.h"
 #include "xbt/fifo.h"
-#include "mc_state.h"
-#include "mc_request.h"
-#include "mc_private.h"
-#include "mc_comm_pattern.h"
-#include "mc_smx.h"
-#include "mc_xbt.hpp"
+#include "src/mc/mc_state.h"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_xbt.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index 7cf2315..8ab1b11 100644 (file)
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -11,7 +11,7 @@
 
 #include <simgrid_config.h>
 #include "src/simix/smx_private.h"
-#include "mc_snapshot.h"
+#include "src/mc/mc_snapshot.h"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp
index 8879bde..aab93dd 100644 (file)
--- a/src/mc/mc_unw.cpp
+++ b/src/mc/mc_unw.cpp
@@ -18,9 +18,9 @@
 
 #include <libunwind.h>
 
-#include "mc_object_info.h"
+#include "src/mc/mc_object_info.h"
 #include "src/mc/Process.hpp"
-#include "mc_unw.h"
+#include "src/mc/mc_unw.h"
 #include "src/mc/Frame.hpp"
 
 using simgrid::mc::remote;

diff --git a/src/mc/mc_unw_vmread.cpp b/src/mc/mc_unw_vmread.cpp
index cf505c7..45e767b 100644 (file)
--- a/src/mc/mc_unw_vmread.cpp
+++ b/src/mc/mc_unw_vmread.cpp
@@ -10,7 +10,7 @@
 #include <libunwind.h>
 #include <libunwind-ptrace.h>
 
-#include "mc_unw.h"
+#include "src/mc/mc_unw.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_visited.cpp b/src/mc/mc_visited.cpp
index 09385c1..459db40 100644 (file)
--- a/src/mc/mc_visited.cpp
+++ b/src/mc/mc_visited.cpp
@@ -7,12 +7,12 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include "mc_comm_pattern.h"
-#include "mc_safety.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
 #include "src/mc/Process.hpp"
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 
 extern "C" {
 

diff --git a/src/mc/mc_xbt.cpp b/src/mc/mc_xbt.cpp
index 3be0e93..6c832f8 100644 (file)
--- a/src/mc/mc_xbt.cpp
+++ b/src/mc/mc_xbt.cpp
@@ -7,7 +7,7 @@
 #include <xbt/sysdep.h>
 
 #include "src/mc/AddressSpace.hpp"
-#include "mc_xbt.hpp"
+#include "src/mc/mc_xbt.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index b6d30da..a923cdb 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -29,13 +29,13 @@
 #include "simgrid/sg_config.h"
 #include "src/xbt_modinter.h"
 
-#include "mc_base.h"
-#include "mc_private.h"
-#include "mc_protocol.h"
-#include "mc_safety.h"
-#include "mc_comm_pattern.h"
-#include "mc_liveness.h"
-#include "mc_exit.h"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_exit.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");