From d098dd9e12ee321b061421f535b2b56ce7691673 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 25 Nov 2015 12:56:44 +0100 Subject: [PATCH] [mc] Better #includes Use "#include src/mc/foo" instead of "#include foo" --- src/mc/AddressSpace.cpp | 2 +- src/mc/AddressSpace.hpp | 2 +- src/mc/DwarfExpression.cpp | 6 +++--- src/mc/Frame.hpp | 2 +- src/mc/LocationList.cpp | 2 +- src/mc/LocationList.hpp | 4 ++-- src/mc/ModelChecker.cpp | 14 +++++++------- src/mc/ModelChecker.hpp | 4 ++-- src/mc/PageStore.cpp | 4 ++-- src/mc/PageStore.hpp | 4 ++-- src/mc/Process.cpp | 10 +++++----- src/mc/Process.hpp | 13 ++++++------- src/mc/RegionSnapshot.cpp | 2 +- src/mc/Type.hpp | 2 +- src/mc/Variable.hpp | 2 +- src/mc/mc_base.cpp | 6 +++--- src/mc/mc_checkpoint.cpp | 16 ++++++++-------- src/mc/mc_client.cpp | 12 ++++++------ src/mc/mc_client.h | 2 +- src/mc/mc_client_api.cpp | 14 +++++++------- src/mc/mc_comm_determinism.cpp | 18 +++++++++--------- src/mc/mc_comm_pattern.cpp | 6 +++--- src/mc/mc_comm_pattern.h | 2 +- src/mc/mc_compare.cpp | 12 ++++++------ src/mc/mc_config.cpp | 6 +++--- src/mc/mc_diff.cpp | 2 +- src/mc/mc_dwarf.cpp | 6 +++--- src/mc/mc_global.cpp | 24 ++++++++++++------------ src/mc/mc_hash.cpp | 4 ++-- src/mc/mc_hash.hpp | 2 +- src/mc/mc_ignore.cpp | 10 +++++----- src/mc/mc_liveness.cpp | 18 +++++++++--------- src/mc/mc_liveness.h | 2 +- src/mc/mc_member.cpp | 4 ++-- src/mc/mc_memory.cpp | 4 ++-- src/mc/mc_object_info.h | 2 +- src/mc/mc_page_snapshot.cpp | 8 ++++---- src/mc/mc_pair.cpp | 4 ++-- src/mc/mc_private.h | 6 +++--- src/mc/mc_protocol.cpp | 4 ++-- src/mc/mc_record.cpp | 14 +++++++------- src/mc/mc_request.cpp | 10 +++++----- src/mc/mc_safety.cpp | 16 ++++++++-------- src/mc/mc_safety.h | 4 ++-- src/mc/mc_smx.cpp | 2 +- src/mc/mc_smx.h | 2 +- src/mc/mc_snapshot.cpp | 8 ++++---- src/mc/mc_snapshot.h | 12 ++++++------ src/mc/mc_state.cpp | 12 ++++++------ src/mc/mc_state.h | 2 +- src/mc/mc_unw.cpp | 4 ++-- src/mc/mc_unw_vmread.cpp | 2 +- src/mc/mc_visited.cpp | 10 +++++----- src/mc/mc_xbt.cpp | 2 +- src/mc/simgrid_mc.cpp | 14 +++++++------- 55 files changed, 190 insertions(+), 191 deletions(-) diff --git a/src/mc/AddressSpace.cpp b/src/mc/AddressSpace.cpp index 7050e2a49b..e84bac215c 100644 --- 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 6aed5ea8a2..5b55a3106e 100644 --- a/src/mc/AddressSpace.hpp +++ b/src/mc/AddressSpace.hpp @@ -13,7 +13,7 @@ #include -#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 472a2a5cf3..ecedcb2da5 100644 --- a/src/mc/DwarfExpression.cpp +++ b/src/mc/DwarfExpression.cpp @@ -10,14 +10,14 @@ #include #include -#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 77fcc050b4..ee39960531 100644 --- a/src/mc/Frame.hpp +++ b/src/mc/Frame.hpp @@ -11,7 +11,7 @@ #include -#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 f11ea28871..652d3f0d2b 100644 --- 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 e23ba405cb..c5c186f29b 100644 --- a/src/mc/LocationList.hpp +++ b/src/mc/LocationList.hpp @@ -16,8 +16,8 @@ #include #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 4d2b523a76..5c947d25a6 100644 --- 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 ee1a9553bf..75b2f5d301 100644 --- a/src/mc/ModelChecker.hpp +++ b/src/mc/ModelChecker.hpp @@ -17,10 +17,10 @@ #include #include -#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 88ea8066be..403ef31c42 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -11,9 +11,9 @@ #include -#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 36c90d002c..8ed78ad023 100644 --- a/src/mc/PageStore.hpp +++ b/src/mc/PageStore.hpp @@ -15,8 +15,8 @@ #include -#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 f90af18891..d7e12bf060 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -27,11 +27,11 @@ #include -#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 ab4eaeaa49..2f51240fcf 100644 --- 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 007fcd0759..d3f49de652 100644 --- a/src/mc/RegionSnapshot.cpp +++ b/src/mc/RegionSnapshot.cpp @@ -7,7 +7,7 @@ #include #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 a3bffd5724..819cf81b6e 100644 --- a/src/mc/Type.hpp +++ b/src/mc/Type.hpp @@ -12,7 +12,7 @@ #include -#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 176cf46125..5ca55ab08c 100644 --- a/src/mc/Variable.hpp +++ b/src/mc/Variable.hpp @@ -11,7 +11,7 @@ #include -#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 5a7f2f8412..d7cf4ebc5e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -8,17 +8,17 @@ #include -#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 6bafeae722..9aa90a6977 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -11,7 +11,7 @@ #include #include "src/internal_config.h" -#include "mc_private.h" +#include "src/mc/mc_private.h" #include "xbt/module.h" #include #include "src/smpi/private.h" @@ -24,15 +24,15 @@ #include #include -#include "mc_private.h" +#include "src/mc/mc_private.h" #include -#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 12edc6bfa1..3956391ae0 100644 --- a/src/mc/mc_client.cpp +++ b/src/mc/mc_client.cpp @@ -15,14 +15,14 @@ #include #include -#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 079c441714..6b68dbe45d 100644 --- a/src/mc/mc_client.h +++ b/src/mc/mc_client.h @@ -8,7 +8,7 @@ #define SIMGRID_MC_CLIENT_H #include -#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 372f3c4082..9bbceb0248 100644 --- a/src/mc/mc_client_api.cpp +++ b/src/mc/mc_client_api.cpp @@ -9,13 +9,13 @@ #include #include -#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 019e609cef..9525f92664 100644 --- 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 3bb5deb5e1..d29df34808 100644 --- a/src/mc/mc_comm_pattern.cpp +++ b/src/mc/mc_comm_pattern.cpp @@ -9,9 +9,9 @@ #include #include -#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 285256ade1..83c386a4c8 100644 --- a/src/mc/mc_comm_pattern.h +++ b/src/mc/mc_comm_pattern.h @@ -16,7 +16,7 @@ #include "src/smpi/private.h" #include -#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 ed0d50e18d..5740b049c4 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -13,12 +13,12 @@ #include #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 b863136857..09a12142be 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -14,11 +14,11 @@ #include #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 f1694c48c1..d3f290415f 100644 --- 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 c744d0aec6..e7a7b6c0b3 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -20,9 +20,9 @@ #include #include -#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 dc9b5f89b2..b1e8b480d2 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -31,19 +31,19 @@ #include #include #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 7a0249db13..ba391fab58 100644 --- a/src/mc/mc_hash.cpp +++ b/src/mc/mc_hash.cpp @@ -8,9 +8,9 @@ #include -#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 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 4a8dd6ab5c..767fcc062c 100644 --- a/src/mc/mc_hash.hpp +++ b/src/mc/mc_hash.hpp @@ -11,7 +11,7 @@ #include #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 debb2a4ac7..ccac7338fb 100644 --- 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 7eef307269..2bdc1a7105 100644 --- a/src/mc/mc_liveness.cpp +++ b/src/mc/mc_liveness.cpp @@ -10,15 +10,15 @@ #include #include -#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 a72af0cd5f..f33cc5428e 100644 --- a/src/mc/mc_liveness.h +++ b/src/mc/mc_liveness.h @@ -13,7 +13,7 @@ #include #include #include -#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 bbe2eef3f0..0a5040bf61 100644 --- a/src/mc/mc_member.cpp +++ b/src/mc/mc_member.cpp @@ -6,8 +6,8 @@ #include -#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 a3ce18d275..5594edc565 100644 --- 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 91d8825988..da93084f24 100644 --- a/src/mc/mc_object_info.h +++ b/src/mc/mc_object_info.h @@ -12,7 +12,7 @@ #include -#include "mc_forward.hpp" +#include "src/mc/mc_forward.hpp" #include "src/xbt/memory_map.hpp" XBT_PRIVATE std::shared_ptr MC_find_object_info( diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp index 4463448890..49986e0445 100644 --- a/src/mc/mc_page_snapshot.cpp +++ b/src/mc/mc_page_snapshot.cpp @@ -8,10 +8,10 @@ #include // 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 #include "src/mc/ChunkedData.hpp" diff --git a/src/mc/mc_pair.cpp b/src/mc/mc_pair.cpp index 12936db18b..129e69ad5b 100644 --- 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 -#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 5bd89c1108..17982ed2c0 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -19,7 +19,7 @@ #include #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 -#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 38c6547788..ce70fabcea 100644 --- a/src/mc/mc_protocol.cpp +++ b/src/mc/mc_protocol.cpp @@ -13,8 +13,8 @@ #include -#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 53fe65421c..824466a682 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -11,15 +11,15 @@ #include #include -#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 ef553fdd5d..c77bc95719 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -6,11 +6,11 @@ #include -#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 89c707618d..1642b3add9 100644 --- a/src/mc/mc_safety.cpp +++ b/src/mc/mc_safety.cpp @@ -6,14 +6,14 @@ #include -#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 adc9d6a3af..d6c907dcb7 100644 --- a/src/mc/mc_safety.h +++ b/src/mc/mc_safety.h @@ -12,8 +12,8 @@ #include #include #include -#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 ee53d1ab26..9e95602299 100644 --- 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 d94c41454a..0b8f9cd66c 100644 --- 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 e1b67f1754..6698e9263c 100644 --- 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 fdc74ef78a..5c638f6f81 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -20,13 +20,13 @@ #include #include -#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 ca00fc0c67..e0e61217b1 100644 --- 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 7cf2315feb..8ab1b11fa5 100644 --- a/src/mc/mc_state.h +++ b/src/mc/mc_state.h @@ -11,7 +11,7 @@ #include #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 8879bde493..aab93dd702 100644 --- a/src/mc/mc_unw.cpp +++ b/src/mc/mc_unw.cpp @@ -18,9 +18,9 @@ #include -#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 cf505c7fa3..45e767b592 100644 --- a/src/mc/mc_unw_vmread.cpp +++ b/src/mc/mc_unw_vmread.cpp @@ -10,7 +10,7 @@ #include #include -#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 09385c1434..459db40418 100644 --- a/src/mc/mc_visited.cpp +++ b/src/mc/mc_visited.cpp @@ -7,12 +7,12 @@ #include #include -#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 3be0e93874..6c832f89cb 100644 --- a/src/mc/mc_xbt.cpp +++ b/src/mc/mc_xbt.cpp @@ -7,7 +7,7 @@ #include #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 b6d30da9ad..a923cdbcea 100644 --- 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"); -- 2.20.1