From 1fc042e8bc9c51f9267fa1936deaebe59ae01ee7 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 10 Oct 2017 11:48:21 +0200 Subject: [PATCH] Sort include lists according to clang-format. --- src/bindings/java/jmsg.cpp | 4 ++-- src/bindings/java/jmsg_as.cpp | 2 +- src/bindings/java/jmsg_as.hpp | 2 +- src/bindings/java/jmsg_comm.cpp | 2 +- src/bindings/java/jmsg_host.cpp | 2 +- src/bindings/java/jmsg_process.cpp | 2 +- src/bindings/java/jmsg_task.cpp | 2 +- src/bindings/java/jxbt_utilities.cpp | 2 +- src/bindings/java/jxbt_utilities.hpp | 2 +- src/include/surf/maxmin.hpp | 4 ++-- src/instr/instr_paje_header.cpp | 2 +- src/instr/instr_paje_trace.cpp | 2 +- src/instr/instr_private.hpp | 2 +- src/kernel/context/ContextBoost.cpp | 2 +- src/kernel/context/ContextRaw.cpp | 2 +- src/kernel/context/ContextThread.cpp | 6 ++--- src/mc/DwarfExpression.cpp | 7 +++--- src/mc/PageStore.hpp | 2 +- src/mc/Session.cpp | 4 ++-- src/mc/checker/Checker.hpp | 2 +- src/mc/checker/LivenessChecker.hpp | 6 ++--- src/mc/compare.cpp | 10 ++++----- src/mc/mc_config.cpp | 2 +- src/mc/mc_dwarf.cpp | 2 +- src/mc/mc_hash.cpp | 4 ++-- src/mc/mc_member.cpp | 2 +- src/mc/mc_mmu.hpp | 2 ++ src/mc/mc_record.cpp | 10 ++++----- src/mc/mc_smx.cpp | 2 +- src/mc/mc_snapshot.cpp | 8 +++---- src/mc/mc_snapshot.hpp | 4 ++-- src/mc/mc_state.hpp | 4 ++-- src/mc/mc_unw.hpp | 2 +- src/s4u/s4u_comm.cpp | 2 +- src/simgrid/sg_config.cpp | 22 +++++++++---------- src/simix/popping_private.hpp | 2 +- src/simix/smx_context.cpp | 8 +++---- src/simix/smx_environment.cpp | 6 ++--- src/simix/smx_global.cpp | 4 ++-- src/simix/smx_host_private.hpp | 4 ++-- src/simix/smx_io.cpp | 2 +- src/simix/smx_io_private.hpp | 2 +- src/smpi/bindings/smpi_f77_coll.cpp | 2 +- src/smpi/bindings/smpi_pmpi_coll.cpp | 2 +- src/smpi/bindings/smpi_pmpi_group.cpp | 2 +- src/smpi/bindings/smpi_pmpi_request.cpp | 2 +- src/smpi/bindings/smpi_pmpi_win.cpp | 2 +- .../colls/barrier/barrier-mvapich2-pair.cpp | 2 +- src/smpi/colls/barrier/barrier-ompi.cpp | 2 +- src/smpi/colls/bcast/bcast-ompi-pipeline.cpp | 2 +- .../colls/bcast/bcast-ompi-split-bintree.cpp | 2 +- src/smpi/colls/coll_tuned_topo.cpp | 2 +- src/smpi/colls/colls_private.hpp | 4 ++-- src/smpi/colls/gather/gather-ompi.cpp | 2 +- src/smpi/colls/reduce/reduce-ompi.cpp | 2 +- .../reduce_scatter/reduce_scatter-ompi.cpp | 2 +- src/smpi/colls/scatter/scatter-ompi.cpp | 2 +- src/smpi/colls/smpi_coll.cpp | 2 +- src/smpi/include/smpi_coll.hpp | 1 + src/smpi/include/smpi_process.hpp | 2 +- src/smpi/include/smpi_win.hpp | 2 ++ src/smpi/internals/smpi_deployment.cpp | 2 +- src/smpi/internals/smpi_global.cpp | 14 ++++++------ src/smpi/internals/smpi_process.cpp | 8 +++---- src/smpi/internals/smpi_static_variables.cpp | 2 +- src/smpi/mpi/smpi_f2c.cpp | 2 +- src/smpi/mpi/smpi_status.cpp | 4 ++-- src/smpi/mpi/smpi_win.cpp | 2 +- src/surf/cpu_interface.cpp | 2 +- src/surf/maxmin_private.hpp | 4 ++-- src/surf/network_ns3.cpp | 2 +- src/surf/surf_private.hpp | 4 ++-- 72 files changed, 126 insertions(+), 124 deletions(-) diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 971a49688a..6119a6402f 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -17,13 +17,13 @@ #include "src/simix/smx_private.hpp" -#include "jmsg_process.h" +#include "jmsg.hpp" #include "jmsg_as.hpp" #include "jmsg_host.h" +#include "jmsg_process.h" #include "jmsg_storage.h" #include "jmsg_task.h" #include "jxbt_utilities.hpp" -#include "jmsg.hpp" #include "JavaContext.hpp" diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index 3b5109b8cc..d06d1d439a 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -9,10 +9,10 @@ #include "simgrid/s4u/NetZone.hpp" #include "src/kernel/routing/NetZoneImpl.hpp" +#include "jmsg.hpp" #include "jmsg_as.hpp" #include "jmsg_host.h" #include "jxbt_utilities.hpp" -#include "jmsg.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_as.hpp b/src/bindings/java/jmsg_as.hpp index f79ef9be2d..ffe15a794d 100644 --- a/src/bindings/java/jmsg_as.hpp +++ b/src/bindings/java/jmsg_as.hpp @@ -7,8 +7,8 @@ #ifndef JMSG_AS_HPP #define JMSG_AS_HPP -#include #include "simgrid/msg.h" +#include extern "C" { diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index f58666ac6d..d3e412790a 100644 --- a/src/bindings/java/jmsg_comm.cpp +++ b/src/bindings/java/jmsg_comm.cpp @@ -6,8 +6,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "jmsg_comm.h" -#include "jxbt_utilities.hpp" #include "jmsg.hpp" +#include "jxbt_utilities.hpp" #include #include diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index 98b7f09c84..f51c91da94 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -11,8 +11,8 @@ #include "jmsg.hpp" #include "jmsg_host.h" -#include "jxbt_utilities.hpp" #include "jmsg_storage.h" +#include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 330a89b121..ad3f399432 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -9,10 +9,10 @@ #include "jmsg_process.h" +#include "JavaContext.hpp" #include "jmsg.hpp" #include "jmsg_host.h" #include "jxbt_utilities.hpp" -#include "JavaContext.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 77a54f04a3..7a473f6290 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -9,8 +9,8 @@ #include "jmsg.hpp" #include "jmsg_host.h" -#include "jmsg_task.h" #include "jmsg_process.h" +#include "jmsg_task.h" #include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp index 5a285b3337..1853d1bcff 100644 --- a/src/bindings/java/jxbt_utilities.cpp +++ b/src/bindings/java/jxbt_utilities.cpp @@ -5,8 +5,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 "xbt/sysdep.h" #include "jxbt_utilities.hpp" +#include "xbt/sysdep.h" #include /* abort */ diff --git a/src/bindings/java/jxbt_utilities.hpp b/src/bindings/java/jxbt_utilities.hpp index 09988eb196..1026f96c26 100644 --- a/src/bindings/java/jxbt_utilities.hpp +++ b/src/bindings/java/jxbt_utilities.hpp @@ -8,8 +8,8 @@ #ifndef JXBT_UTILITIES_HPP #define JXBT_UTILITIES_HPP -#include #include +#include #include extern "C" { diff --git a/src/include/surf/maxmin.hpp b/src/include/surf/maxmin.hpp index 95b0ebc33b..31c5d19768 100644 --- a/src/include/surf/maxmin.hpp +++ b/src/include/surf/maxmin.hpp @@ -7,9 +7,9 @@ #define SURF_MAXMIN_HPP #include "src/internal_config.h" -#include "xbt/misc.h" -#include "xbt/asserts.h" #include "surf/datatypes.h" +#include "xbt/asserts.h" +#include "xbt/misc.h" #include namespace simgrid { diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp index 5a85e12405..f7e04f5d3b 100644 --- a/src/instr/instr_paje_header.cpp +++ b/src/instr/instr_paje_header.cpp @@ -4,8 +4,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 "src/instr/instr_private.hpp" #include "simgrid/sg_config.h" +#include "src/instr/instr_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event system (header)"); diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index e6825968f7..23ed224460 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -4,12 +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 "simgrid/sg_config.h" #include "src/instr/instr_private.hpp" #include "src/instr/instr_smpi.hpp" #include "src/smpi/include/private.hpp" #include "typeinfo" #include "xbt/virtu.h" /* sg_cmdline */ -#include "simgrid/sg_config.h" #include #include diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 50a189a856..05a663108c 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -24,8 +24,8 @@ #define INSTR_DEFAULT_STR_SIZE 500 -#include "xbt/graph.h" #include "xbt/dict.h" +#include "xbt/graph.h" namespace simgrid { namespace instr { diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 03c81c5896..3e1836237d 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -14,9 +14,9 @@ #include #include -#include "src/simix/smx_private.hpp" #include "src/internal_config.h" #include "src/kernel/context/ContextBoost.hpp" +#include "src/simix/smx_private.hpp" #if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT #include diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 17f77d5f7c..1df1de7fdb 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -7,8 +7,8 @@ #include "xbt/parmap.hpp" -#include "src/simix/smx_private.hpp" #include "mc/mc.h" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 2cbeeafd4e..ebcdfbef65 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -6,12 +6,12 @@ #include #include -#include "xbt/function_types.h" +#include "src/internal_config.h" /* loads context system definitions */ #include "src/simix/smx_private.hpp" -#include "src/internal_config.h" /* loads context system definitions */ +#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ +#include "xbt/function_types.h" #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" -#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ #include "src/kernel/context/ContextThread.hpp" diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp index 81f2cbceae..bfa4f16611 100644 --- a/src/mc/DwarfExpression.cpp +++ b/src/mc/DwarfExpression.cpp @@ -9,14 +9,15 @@ #include #include +#include -#include "src/mc/mc_private.hpp" -#include "src/mc/LocationList.hpp" #include "src/mc/AddressSpace.hpp" +#include "src/mc/DwarfExpression.hpp" #include "src/mc/Frame.hpp" +#include "src/mc/LocationList.hpp" #include "src/mc/ObjectInformation.hpp" -#include "src/mc/DwarfExpression.hpp" #include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_private.hpp" using simgrid::mc::remote; diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp index d0c3432bce..4ae359f90b 100644 --- a/src/mc/PageStore.hpp +++ b/src/mc/PageStore.hpp @@ -15,8 +15,8 @@ #include "xbt/base.h" -#include "src/mc/mc_mmu.hpp" #include "src/mc/mc_forward.hpp" +#include "src/mc/mc_mmu.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index d1c00c0d99..b88f98dd72 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -16,9 +16,9 @@ #include #include "src/mc/Session.hpp" -#include "src/mc/mc_state.hpp" -#include "src/mc/mc_private.hpp" #include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_state.hpp" #include "src/smpi/include/private.hpp" diff --git a/src/mc/checker/Checker.hpp b/src/mc/checker/Checker.hpp index 3e0cec84bb..4de42ae0b5 100644 --- a/src/mc/checker/Checker.hpp +++ b/src/mc/checker/Checker.hpp @@ -11,9 +11,9 @@ #include #include +#include "src/mc/Session.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_record.hpp" -#include "src/mc/Session.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index a6c6f42f12..160b77cb88 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -14,11 +14,11 @@ #include #include +#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_state.hpp" #include -#include #include -#include "src/mc/mc_state.hpp" -#include "src/mc/checker/Checker.hpp" +#include namespace simgrid { namespace mc { diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 15d99f3409..6516f895a3 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -28,17 +28,15 @@ #include "src/smpi/include/private.hpp" #endif -#include "src/mc/mc_forward.hpp" -#include "src/mc/mc_private.hpp" -#include "src/mc/mc_smx.hpp" -#include "src/mc/mc_dwarf.hpp" #include "src/mc/Frame.hpp" #include "src/mc/ObjectInformation.hpp" +#include "src/mc/Type.hpp" #include "src/mc/Variable.hpp" +#include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_forward.hpp" #include "src/mc/mc_private.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/mc_snapshot.hpp" -#include "src/mc/mc_dwarf.hpp" -#include "src/mc/Type.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index d62c068c2b..566544c059 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -14,8 +14,8 @@ #include #if SIMGRID_HAVE_MC -#include "src/mc/mc_safety.hpp" #include "src/mc/mc_private.hpp" +#include "src/mc/mc_safety.hpp" #endif #include "src/mc/mc_record.hpp" diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index 5330a6bfd3..3a21afc831 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -25,8 +25,8 @@ #include "xbt/sysdep.h" #include -#include "src/mc/mc_private.hpp" #include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_private.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Variable.hpp" diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp index 082e8773e3..9a77423c2e 100644 --- a/src/mc/mc_hash.cpp +++ b/src/mc/mc_hash.cpp @@ -10,10 +10,10 @@ #include "xbt/log.h" -#include "src/mc/mc_private.hpp" -#include "src/mc/mc_snapshot.hpp" #include "mc/datatypes.h" #include "src/mc/mc_hash.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash"); diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp index a8bec1f540..c2c67e7b1e 100644 --- a/src/mc/mc_member.cpp +++ b/src/mc/mc_member.cpp @@ -4,9 +4,9 @@ /* 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 "src/mc/mc_private.hpp" #include "src/mc/Type.hpp" #include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_private.hpp" namespace simgrid { namespace dwarf { diff --git a/src/mc/mc_mmu.hpp b/src/mc/mc_mmu.hpp index a6de7acebb..d406e8989e 100644 --- a/src/mc/mc_mmu.hpp +++ b/src/mc/mc_mmu.hpp @@ -7,6 +7,8 @@ #define SIMGRID_MC_MMU_HPP #include "xbt/misc.h" // xbt_pagesize... +#include +#include namespace simgrid { namespace mc { diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index e61504e00a..5939b8401d 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -18,20 +18,20 @@ #include "simgrid/simix.h" #include "src/kernel/context/Context.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_replay.h" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_private.hpp" -#include "src/mc/mc_replay.h" -#include "src/mc/mc_record.hpp" #include "src/mc/mc_base.h" #include "src/mc/Transition.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/mc_request.hpp" +#include "src/mc/checker/Checker.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_state.hpp" +#include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" -#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_state.hpp" #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 044939cb61..4711074164 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -5,8 +5,8 @@ #include "simgrid/s4u/Host.hpp" -#include "src/mc/mc_smx.hpp" #include "src/mc/ModelChecker.hpp" +#include "src/mc/mc_smx.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp index 1b3504ef67..ce1c2a8263 100644 --- a/src/mc/mc_snapshot.cpp +++ b/src/mc/mc_snapshot.cpp @@ -15,10 +15,10 @@ #include "src/internal_config.h" #include "src/smpi/include/private.hpp" -#include "src/mc/mc_snapshot.hpp" -#include "src/mc/mc_private.hpp" -#include "src/mc/mc_mmu.hpp" #include "src/mc/PageStore.hpp" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" extern "C" { @@ -201,9 +201,9 @@ const void* Snapshot::read_bytes(void* buffer, std::size_t size, #include +#include "src/mc/mc_mmu.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_snapshot.hpp" -#include "src/mc/mc_mmu.hpp" XBT_TEST_SUITE("mc_snapshot", "Snapshots"); diff --git a/src/mc/mc_snapshot.hpp b/src/mc/mc_snapshot.hpp index eab2acf26c..a1d4049e88 100644 --- a/src/mc/mc_snapshot.hpp +++ b/src/mc/mc_snapshot.hpp @@ -6,10 +6,10 @@ #ifndef SIMGRID_MC_SNAPSHOT_HPP #define SIMGRID_MC_SNAPSHOT_HPP -#include +#include #include #include -#include +#include #include "src/mc/ModelChecker.hpp" #include "src/mc/RegionSnapshot.hpp" diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp index e9b0d7b184..8fe92e3dc7 100644 --- a/src/mc/mc_state.hpp +++ b/src/mc/mc_state.hpp @@ -9,9 +9,9 @@ #include #include -#include "src/mc/mc_snapshot.hpp" -#include "src/mc/mc_record.hpp" #include "src/mc/Transition.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_snapshot.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/mc_unw.hpp b/src/mc/mc_unw.hpp index 3a62c533cb..e5e066d144 100644 --- a/src/mc/mc_unw.hpp +++ b/src/mc/mc_unw.hpp @@ -28,8 +28,8 @@ #include "src/mc/mc_forward.hpp" #include "xbt/base.h" -#include #include +#include #include namespace simgrid { diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp index bcd60c3235..f1f3135347 100644 --- a/src/s4u/s4u_comm.cpp +++ b/src/s4u/s4u_comm.cpp @@ -3,8 +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 "xbt/log.h" #include "src/msg/msg_private.hpp" +#include "xbt/log.h" #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index ee90057c2a..752cf85455 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -6,22 +6,22 @@ /* sg_config: configuration infrastructure for the simulation world */ -#include "xbt/misc.h" -#include "xbt/config.h" -#include "xbt/config.hpp" -#include "xbt/log.h" -#include "xbt/mallocator.h" -#include "xbt/sysdep.h" -#include "surf/surf.h" -#include "surf/maxmin.hpp" -#include "instr/instr_interface.h" -#include "simgrid/simix.h" #include "simgrid/sg_config.h" -#include "simgrid_config.h" /* what was compiled in? */ +#include "instr/instr_interface.h" #include "mc/mc.h" #include "simgrid/instr.h" +#include "simgrid/simix.h" +#include "simgrid_config.h" /* what was compiled in? */ #include "src/mc/mc_replay.h" #include "src/surf/surf_interface.hpp" +#include "surf/maxmin.hpp" +#include "surf/surf.h" +#include "xbt/config.h" +#include "xbt/config.hpp" +#include "xbt/log.h" +#include "xbt/mallocator.h" +#include "xbt/misc.h" +#include "xbt/sysdep.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index 71b10506fe..e311a67bf8 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -6,8 +6,8 @@ #ifndef SG_POPPING_PRIVATE_HPP #define SG_POPPING_PRIVATE_HPP -#include #include +#include #include #include diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 217dbe561d..6b0c54b944 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -16,15 +16,13 @@ #include #include +#include "simgrid/modelchecker.h" +#include "simgrid/sg_config.h" +#include "smx_private.hpp" #include "src/internal_config.h" #include "xbt/log.h" #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" -#include "smx_private.hpp" -#include "simgrid/sg_config.h" -#include "src/internal_config.h" -#include "simgrid/modelchecker.h" - #ifdef _WIN32 #include diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp index 4025023187..3332c1d617 100644 --- a/src/simix/smx_environment.cpp +++ b/src/simix/smx_environment.cpp @@ -5,11 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smx_private.hpp" -#include -#include "xbt/sysdep.h" +#include "xbt/config.h" #include "xbt/log.h" +#include "xbt/sysdep.h" #include "xbt/xbt_os_time.h" -#include "xbt/config.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, "Logging specific to SIMIX (environment)"); diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index b2e7d3123a..d01e0f8cb3 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -16,10 +16,10 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "smx_private.hpp" #include "src/surf/surf_interface.hpp" #include "src/surf/xml/platf.hpp" -#include "smx_private.hpp" -#include "xbt/ex.h" /* ex_backtrace_display */ +#include "xbt/ex.h" /* ex_backtrace_display */ #include "mc/mc.h" #include "simgrid/sg_config.h" diff --git a/src/simix/smx_host_private.hpp b/src/simix/smx_host_private.hpp index ab59350471..5aab49d436 100644 --- a/src/simix/smx_host_private.hpp +++ b/src/simix/smx_host_private.hpp @@ -10,11 +10,11 @@ #include #include -#include #include +#include -#include "simgrid/simix.h" #include "popping_private.hpp" +#include "simgrid/simix.h" #include "src/kernel/activity/ExecImpl.hpp" diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index abe0fa8d6f..90c7f88dc1 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -14,8 +14,8 @@ #include "src/surf/StorageImpl.hpp" #include "surf/surf.h" -#include "src/surf/surf_interface.hpp" #include "smx_private.hpp" +#include "src/surf/surf_interface.hpp" #include "src/kernel/activity/SynchroIo.hpp" diff --git a/src/simix/smx_io_private.hpp b/src/simix/smx_io_private.hpp index cdd26bd048..05846b7350 100644 --- a/src/simix/smx_io_private.hpp +++ b/src/simix/smx_io_private.hpp @@ -8,8 +8,8 @@ #include -#include "simgrid/simix.h" #include "popping_private.hpp" +#include "simgrid/simix.h" XBT_PRIVATE smx_activity_t SIMIX_file_read(surf_file_t fd, sg_size_t size); XBT_PRIVATE smx_activity_t SIMIX_file_write(surf_file_t fd, sg_size_t size); diff --git a/src/smpi/bindings/smpi_f77_coll.cpp b/src/smpi/bindings/smpi_f77_coll.cpp index 1ca65b3382..9939a7bcfb 100644 --- a/src/smpi/bindings/smpi_f77_coll.cpp +++ b/src/smpi/bindings/smpi_f77_coll.cpp @@ -4,10 +4,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.hpp" +#include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" -#include "smpi_coll.hpp" extern "C" { // This should really use the C linkage to be usable from Fortran diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index f58808cd63..b642343b49 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -4,8 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.hpp" -#include "smpi_comm.hpp" #include "smpi_coll.hpp" +#include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp index d757f7192f..4f1c188061 100644 --- a/src/smpi/bindings/smpi_pmpi_group.cpp +++ b/src/smpi/bindings/smpi_pmpi_group.cpp @@ -4,8 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.hpp" -#include "smpi_comm.hpp" #include "smpi_coll.hpp" +#include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index c1c98969fb..ac91c2d200 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -6,8 +6,8 @@ #include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" -#include "smpi_request.hpp" #include "smpi_process.hpp" +#include "smpi_request.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 806717fe4a..6c72e88201 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -4,8 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.hpp" -#include "smpi_comm.hpp" #include "smpi_coll.hpp" +#include "smpi_comm.hpp" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp index 611c3eb441..0a9b3b4ee8 100644 --- a/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp +++ b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp @@ -39,8 +39,8 @@ * */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_barrier_mvapich2_pair::barrier(MPI_Comm comm) diff --git a/src/smpi/colls/barrier/barrier-ompi.cpp b/src/smpi/colls/barrier/barrier-ompi.cpp index 8676c45329..727febc25d 100644 --- a/src/smpi/colls/barrier/barrier-ompi.cpp +++ b/src/smpi/colls/barrier/barrier-ompi.cpp @@ -20,8 +20,8 @@ * Additional copyrights may follow */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" /* * Barrier is ment to be a synchronous operation, as some BTLs can mark diff --git a/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp b/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp index bd5e475180..d7e48fd710 100644 --- a/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp +++ b/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp @@ -4,8 +4,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 "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" #define MAXTREEFANOUT 32 diff --git a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp index 1d227ba40b..a2eb2dc1ce 100644 --- a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp +++ b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp @@ -55,8 +55,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" #define MAXTREEFANOUT 32 namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/coll_tuned_topo.cpp b/src/smpi/colls/coll_tuned_topo.cpp index c16628e2f3..06a23b4019 100644 --- a/src/smpi/colls/coll_tuned_topo.cpp +++ b/src/smpi/colls/coll_tuned_topo.cpp @@ -19,8 +19,8 @@ * Additional copyrights may follow */ -#include "colls_private.hpp" #include "coll_tuned_topo.hpp" +#include "colls_private.hpp" /* * Some static helpers. */ diff --git a/src/smpi/colls/colls_private.hpp b/src/smpi/colls/colls_private.hpp index 78669b336f..63ff65c229 100644 --- a/src/smpi/colls/colls_private.hpp +++ b/src/smpi/colls/colls_private.hpp @@ -6,14 +6,14 @@ #ifndef SMPI_COLLS_PRIVATE_HPP #define SMPI_COLLS_PRIVATE_HPP -#include -#include "smpi/mpi.h" #include "private.hpp" +#include "smpi/mpi.h" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" #include "smpi_request.hpp" +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_colls); diff --git a/src/smpi/colls/gather/gather-ompi.cpp b/src/smpi/colls/gather/gather-ompi.cpp index b3083b82b6..4510e088cb 100644 --- a/src/smpi/colls/gather/gather-ompi.cpp +++ b/src/smpi/colls/gather/gather-ompi.cpp @@ -19,8 +19,8 @@ * Additional copyrights may follow */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/reduce/reduce-ompi.cpp b/src/smpi/colls/reduce/reduce-ompi.cpp index 1e368465a6..25e62ec0c5 100644 --- a/src/smpi/colls/reduce/reduce-ompi.cpp +++ b/src/smpi/colls/reduce/reduce-ompi.cpp @@ -19,8 +19,8 @@ * Additional copyrights may follow */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp index 3b9dfd8354..1bc913c448 100644 --- a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp +++ b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp @@ -21,8 +21,8 @@ * Additional copyrights may follow */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" /* * Recursive-halving function is (*mostly*) copied from the BASIC coll module. diff --git a/src/smpi/colls/scatter/scatter-ompi.cpp b/src/smpi/colls/scatter/scatter-ompi.cpp index 01827008d5..89737b61c5 100644 --- a/src/smpi/colls/scatter/scatter-ompi.cpp +++ b/src/smpi/colls/scatter/scatter-ompi.cpp @@ -19,8 +19,8 @@ * Additional copyrights may follow */ -#include "../colls_private.hpp" #include "../coll_tuned_topo.hpp" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp index 1e89798c6e..57ddfa1a02 100644 --- a/src/smpi/colls/smpi_coll.cpp +++ b/src/smpi/colls/smpi_coll.cpp @@ -5,8 +5,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 "private.hpp" #include "smpi_coll.hpp" +#include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" diff --git a/src/smpi/include/smpi_coll.hpp b/src/smpi/include/smpi_coll.hpp index 8410ae7ab7..f9356eae7d 100644 --- a/src/smpi/include/smpi_coll.hpp +++ b/src/smpi/include/smpi_coll.hpp @@ -8,6 +8,7 @@ #ifndef SMPI_COLL_HPP #define SMPI_COLL_HPP +#include "private.hpp" #include "xbt/base.h" /** \brief MPI collective description */ diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp index 04bb58186f..0e480b0105 100644 --- a/src/smpi/include/smpi_process.hpp +++ b/src/smpi/include/smpi_process.hpp @@ -7,8 +7,8 @@ #ifndef SMPI_PROCESS_HPP #define SMPI_PROCESS_HPP -#include "src/instr/instr_smpi.hpp" #include "simgrid/s4u/Mailbox.hpp" +#include "src/instr/instr_smpi.hpp" #include "xbt/synchro.h" namespace simgrid{ diff --git a/src/smpi/include/smpi_win.hpp b/src/smpi/include/smpi_win.hpp index ea49c1238f..8106b22630 100644 --- a/src/smpi/include/smpi_win.hpp +++ b/src/smpi/include/smpi_win.hpp @@ -7,8 +7,10 @@ #ifndef SMPI_WIN_HPP_INCLUDED #define SMPI_WIN_HPP_INCLUDED +#include "smpi_f2c.hpp" #include "smpi_keyvals.hpp" #include "xbt/synchro.h" +#include #include #include diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp index f372239e25..407fe67112 100644 --- a/src/smpi/internals/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -4,9 +4,9 @@ /* 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 "simgrid/msg.h" /* barrier */ #include "SmpiHost.hpp" #include "private.hpp" +#include "simgrid/msg.h" /* barrier */ #include "smpi_comm.hpp" #include diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index fe670b8b27..5fc43b3d55 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -3,20 +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 "mc/mc.h" -#include "simgrid/s4u/Mailbox.hpp" -#include "simgrid/s4u/Host.hpp" -#include "src/msg/msg_private.hpp" -#include "src/simix/smx_private.hpp" -#include "src/surf/surf_interface.hpp" #include "SmpiHost.hpp" -#include "xbt/config.hpp" +#include "mc/mc.h" #include "private.hpp" +#include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Mailbox.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" #include "smpi_group.hpp" #include "smpi_info.hpp" #include "smpi_process.hpp" +#include "src/msg/msg_private.hpp" +#include "src/simix/smx_private.hpp" +#include "src/surf/surf_interface.hpp" +#include "xbt/config.hpp" #include /* DBL_MAX */ #include diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 42a256250e..d073614dad 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -3,14 +3,14 @@ /* 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 "smpi_process.hpp" #include "mc/mc.h" +#include "private.hpp" +#include "smpi_comm.hpp" +#include "smpi_group.hpp" #include "src/mc/mc_replay.h" #include "src/msg/msg_private.hpp" #include "src/simix/smx_private.hpp" -#include "private.hpp" -#include "smpi_process.hpp" -#include "smpi_group.hpp" -#include "smpi_comm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); diff --git a/src/smpi/internals/smpi_static_variables.cpp b/src/smpi/internals/smpi_static_variables.cpp index 63ef04626e..af3ecbb7c2 100644 --- a/src/smpi/internals/smpi_static_variables.cpp +++ b/src/smpi/internals/smpi_static_variables.cpp @@ -3,8 +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 #include "private.hpp" +#include typedef struct s_smpi_static { void *ptr; diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp index 9a11267d1c..0b17daa22c 100644 --- a/src/smpi/mpi/smpi_f2c.cpp +++ b/src/smpi/mpi/smpi_f2c.cpp @@ -3,8 +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 "private.hpp" #include "smpi_f2c.hpp" +#include "private.hpp" #include "smpi_process.hpp" #include diff --git a/src/smpi/mpi/smpi_status.cpp b/src/smpi/mpi/smpi_status.cpp index 9a862c2740..e282a2276c 100644 --- a/src/smpi/mpi/smpi_status.cpp +++ b/src/smpi/mpi/smpi_status.cpp @@ -3,10 +3,10 @@ /* 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 "smpi_status.hpp" #include "private.hpp" -#include "src/simix/smx_private.hpp" #include "smpi_datatype.hpp" -#include "smpi_status.hpp" +#include "src/simix/smx_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp index 4a3596eae4..7cc829aa18 100644 --- a/src/smpi/mpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -3,6 +3,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 "smpi_win.hpp" #include "private.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" @@ -11,7 +12,6 @@ #include "smpi_keyvals.hpp" #include "smpi_process.hpp" #include "smpi_request.hpp" -#include "smpi_win.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)"); diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 16f095d9bf..3ea7017749 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -4,9 +4,9 @@ /* 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 #include "cpu_interface.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp index 5c9093bd26..15de20fffc 100644 --- a/src/surf/maxmin_private.hpp +++ b/src/surf/maxmin_private.hpp @@ -7,9 +7,9 @@ #define SURF_MAXMIN_PRIVATE_H #include "surf/maxmin.hpp" -#include "xbt/swag.h" -#include "xbt/mallocator.h" #include "surf_interface.hpp" +#include "xbt/mallocator.h" +#include "xbt/swag.h" /** @ingroup SURF_lmm * @brief LMM element diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 2c78ab65c6..0a1f72aadc 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -10,8 +10,8 @@ #include "ns3/core-module.h" #include "ns3/node.h" -#include "ns3/ns3_simulator.hpp" #include "network_ns3.hpp" +#include "ns3/ns3_simulator.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/kernel/routing/NetPoint.hpp" diff --git a/src/surf/surf_private.hpp b/src/surf/surf_private.hpp index f42b8c5348..9b35b7c5ac 100644 --- a/src/surf/surf_private.hpp +++ b/src/surf/surf_private.hpp @@ -6,9 +6,9 @@ #ifndef SURF_SURF_PRIVATE_HPP #define SURF_SURF_PRIVATE_HPP -#include "surf/surf.h" -#include "surf/maxmin.hpp" #include "src/surf/trace_mgr.hpp" +#include "surf/maxmin.hpp" +#include "surf/surf.h" #define NO_MAX_DURATION -1.0 -- 2.20.1