From f734ec7475682eb90323e804cbcfddd7e4523992 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 9 Oct 2017 21:46:39 +0200 Subject: [PATCH] Rename C++ only header files from .h to .hpp. --- doc/doxygen/module-smpi.doc | 2 +- src/bindings/java/JavaContext.cpp | 4 +- src/bindings/java/JavaContext.hpp | 4 +- src/bindings/java/jmsg.cpp | 8 +-- src/bindings/java/{jmsg.h => jmsg.hpp} | 4 +- src/bindings/java/jmsg_as.cpp | 6 +- src/bindings/java/{jmsg_as.h => jmsg_as.hpp} | 4 +- src/bindings/java/jmsg_comm.cpp | 4 +- src/bindings/java/jmsg_file.cpp | 4 +- src/bindings/java/jmsg_host.cpp | 4 +- src/bindings/java/jmsg_process.cpp | 4 +- src/bindings/java/jmsg_rngstream.cpp | 2 +- src/bindings/java/jmsg_storage.cpp | 4 +- src/bindings/java/jmsg_synchro.cpp | 4 +- src/bindings/java/jmsg_task.cpp | 4 +- src/bindings/java/jmsg_vm.cpp | 2 +- src/bindings/java/jxbt_utilities.cpp | 2 +- .../{jxbt_utilities.h => jxbt_utilities.hpp} | 4 +- src/bindings/lua/lua_debug.cpp | 5 +- src/bindings/lua/lua_host.cpp | 2 +- src/bindings/lua/lua_platf.cpp | 4 +- .../lua/{lua_private.h => lua_private.hpp} | 8 +-- .../lua/{lua_utils.h => lua_utils.hpp} | 4 +- src/bindings/lua/simgrid_lua.cpp | 6 +- .../lua/{simgrid_lua.h => simgrid_lua.hpp} | 4 +- src/include/surf/{maxmin.h => maxmin.hpp} | 4 +- src/instr/instr_config.cpp | 2 +- src/instr/instr_interface.cpp | 6 +- src/instr/instr_paje_containers.cpp | 2 +- src/instr/instr_paje_header.cpp | 4 +- src/instr/instr_paje_trace.cpp | 4 +- src/instr/instr_paje_types.cpp | 2 +- src/instr/instr_paje_values.cpp | 4 +- .../{instr_private.h => instr_private.hpp} | 4 +- src/instr/instr_resource_utilization.cpp | 2 +- src/instr/{instr_smpi.h => instr_smpi.hpp} | 6 +- src/kernel/activity/CommImpl.cpp | 2 +- src/kernel/activity/ExecImpl.cpp | 2 +- src/kernel/activity/SleepImpl.cpp | 2 +- src/kernel/activity/SynchroIo.cpp | 4 +- src/kernel/context/Context.cpp | 2 +- src/kernel/context/Context.hpp | 10 +-- src/kernel/context/ContextBoost.cpp | 2 +- src/kernel/context/ContextRaw.cpp | 2 +- src/kernel/context/ContextThread.cpp | 2 +- src/kernel/context/ContextUnix.cpp | 2 +- src/kernel/future.cpp | 4 +- src/mc/DwarfExpression.cpp | 4 +- src/mc/ModelChecker.cpp | 8 +-- src/mc/PageStore.cpp | 2 +- src/mc/PageStore.hpp | 4 +- src/mc/RegionSnapshot.cpp | 2 +- src/mc/Session.cpp | 4 +- src/mc/VisitedState.cpp | 4 +- src/mc/VisitedState.hpp | 4 +- src/mc/checker/Checker.hpp | 4 +- .../CommunicationDeterminismChecker.cpp | 12 ++-- src/mc/checker/LivenessChecker.cpp | 12 ++-- src/mc/checker/LivenessChecker.hpp | 2 +- src/mc/checker/SafetyChecker.cpp | 10 +-- src/mc/checker/SafetyChecker.hpp | 4 +- src/mc/checker/simgrid_mc.cpp | 6 +- src/mc/compare.cpp | 8 +-- src/mc/mc_base.cpp | 2 +- src/mc/mc_checkpoint.cpp | 14 ++-- src/mc/mc_client_api.cpp | 6 +- src/mc/mc_comm_pattern.cpp | 2 +- src/mc/mc_comm_pattern.hpp | 2 +- src/mc/mc_config.cpp | 6 +- src/mc/mc_dwarf.cpp | 2 +- src/mc/{mc_exit.h => mc_exit.hpp} | 0 src/mc/mc_global.cpp | 14 ++-- src/mc/mc_hash.cpp | 6 +- src/mc/mc_member.cpp | 4 +- src/mc/mc_memory.cpp | 4 +- src/mc/{mc_mmu.h => mc_mmu.hpp} | 4 +- src/mc/mc_page_snapshot.cpp | 8 +-- src/mc/{mc_private.h => mc_private.hpp} | 4 +- src/mc/mc_record.cpp | 12 ++-- src/mc/{mc_record.h => mc_record.hpp} | 6 +- src/mc/mc_request.cpp | 4 +- src/mc/{mc_request.h => mc_request.hpp} | 6 +- src/mc/{mc_safety.h => mc_safety.hpp} | 4 +- src/mc/mc_smx.cpp | 2 +- src/mc/{mc_smx.h => mc_smx.hpp} | 4 +- src/mc/mc_snapshot.cpp | 12 ++-- src/mc/{mc_snapshot.h => mc_snapshot.hpp} | 6 +- src/mc/mc_state.cpp | 10 +-- src/mc/{mc_state.h => mc_state.hpp} | 8 +-- src/mc/mc_unw.cpp | 2 +- src/mc/{mc_unw.h => mc_unw.hpp} | 4 +- src/mc/mc_unw_vmread.cpp | 2 +- src/mc/remote/Client.cpp | 4 +- src/mc/remote/RemoteClient.cpp | 6 +- src/mc/remote/RemoteClient.hpp | 4 +- src/msg/instr_msg_process.cpp | 4 +- src/msg/instr_msg_task.cpp | 6 +- src/msg/msg_actions.cpp | 2 +- src/msg/msg_deployment.cpp | 4 +- src/msg/msg_environment.cpp | 2 +- src/msg/msg_global.cpp | 2 +- src/msg/msg_gos.cpp | 4 +- src/msg/msg_host.cpp | 5 +- src/msg/msg_io.cpp | 2 +- src/msg/msg_mailbox.cpp | 2 +- src/msg/{msg_private.h => msg_private.hpp} | 4 +- src/msg/msg_process.cpp | 4 +- src/msg/msg_synchro.cpp | 4 +- src/msg/msg_task.cpp | 6 +- src/msg/msg_vm.cpp | 4 +- src/plugins/vm/VirtualMachineImpl.cpp | 2 +- src/plugins/vm/s4u_VirtualMachine.cpp | 4 +- src/s4u/s4u_actor.cpp | 2 +- src/s4u/s4u_comm.cpp | 2 +- src/s4u/s4u_host.cpp | 4 +- src/s4u/s4u_mailbox.cpp | 4 +- src/s4u/s4u_mutex.cpp | 2 +- src/simgrid/host.cpp | 2 +- src/simgrid/sg_config.cpp | 2 +- src/simix/ActorImpl.cpp | 4 +- src/simix/ActorImpl.hpp | 4 +- src/simix/libsmx.cpp | 6 +- src/simix/popping.cpp | 4 +- ...ping_accessors.h => popping_accessors.hpp} | 2 +- src/simix/popping_bodies.cpp | 2 +- src/simix/popping_generated.cpp | 2 +- ...{popping_private.h => popping_private.hpp} | 8 +-- src/simix/simcalls.py | 10 +-- src/simix/smx_context.cpp | 2 +- src/simix/smx_deployment.cpp | 2 +- src/simix/smx_environment.cpp | 4 +- src/simix/smx_global.cpp | 6 +- src/simix/smx_host.cpp | 4 +- ...mx_host_private.h => smx_host_private.hpp} | 6 +- src/simix/smx_io.cpp | 2 +- .../{smx_io_private.h => smx_io_private.hpp} | 6 +- src/simix/smx_network.cpp | 2 +- ...work_private.h => smx_network_private.hpp} | 4 +- src/simix/{smx_private.h => smx_private.hpp} | 4 +- src/simix/smx_synchro.cpp | 2 +- src/smpi/colls/allgather/allgather-2dmesh.cpp | 2 +- src/smpi/colls/allgather/allgather-3dmesh.cpp | 2 +- src/smpi/colls/allgather/allgather-GB.cpp | 2 +- .../colls/allgather/allgather-NTSLR-NB.cpp | 2 +- src/smpi/colls/allgather/allgather-NTSLR.cpp | 2 +- .../colls/allgather/allgather-SMP-NTS.cpp | 2 +- src/smpi/colls/allgather/allgather-bruck.cpp | 2 +- .../colls/allgather/allgather-loosely-lr.cpp | 2 +- .../colls/allgather/allgather-mvapich-smp.cpp | 2 +- .../allgather-ompi-neighborexchange.cpp | 2 +- src/smpi/colls/allgather/allgather-pair.cpp | 2 +- src/smpi/colls/allgather/allgather-rdb.cpp | 2 +- src/smpi/colls/allgather/allgather-rhv.cpp | 2 +- src/smpi/colls/allgather/allgather-ring.cpp | 2 +- .../colls/allgather/allgather-smp-simple.cpp | 2 +- .../allgather/allgather-spreading-simple.cpp | 2 +- src/smpi/colls/allgatherv/allgatherv-GB.cpp | 2 +- .../colls/allgatherv/allgatherv-mpich-rdb.cpp | 2 +- .../allgatherv/allgatherv-mpich-ring.cpp | 2 +- .../allgatherv/allgatherv-ompi-bruck.cpp | 2 +- .../allgatherv-ompi-neighborexchange.cpp | 2 +- src/smpi/colls/allgatherv/allgatherv-pair.cpp | 2 +- src/smpi/colls/allgatherv/allgatherv-ring.cpp | 2 +- src/smpi/colls/allreduce/allreduce-lr.cpp | 2 +- .../colls/allreduce/allreduce-mvapich-rs.cpp | 2 +- .../allreduce/allreduce-mvapich-two-level.cpp | 2 +- .../allreduce-ompi-ring-segmented.cpp | 2 +- .../colls/allreduce/allreduce-rab-rdb.cpp | 2 +- src/smpi/colls/allreduce/allreduce-rab1.cpp | 2 +- src/smpi/colls/allreduce/allreduce-rab2.cpp | 2 +- src/smpi/colls/allreduce/allreduce-rdb.cpp | 2 +- .../colls/allreduce/allreduce-redbcast.cpp | 2 +- .../allreduce-smp-binomial-pipeline.cpp | 2 +- .../allreduce/allreduce-smp-binomial.cpp | 2 +- .../colls/allreduce/allreduce-smp-rdb.cpp | 2 +- .../colls/allreduce/allreduce-smp-rsag-lr.cpp | 2 +- .../allreduce/allreduce-smp-rsag-rab.cpp | 2 +- .../colls/allreduce/allreduce-smp-rsag.cpp | 2 +- src/smpi/colls/alltoall/alltoall-2dmesh.cpp | 2 +- src/smpi/colls/alltoall/alltoall-3dmesh.cpp | 2 +- .../colls/alltoall/alltoall-basic-linear.cpp | 2 +- src/smpi/colls/alltoall/alltoall-bruck.cpp | 2 +- .../alltoall-mvapich-scatter-dest.cpp | 2 +- .../alltoall/alltoall-pair-light-barrier.cpp | 2 +- .../alltoall/alltoall-pair-mpi-barrier.cpp | 2 +- .../alltoall/alltoall-pair-one-barrier.cpp | 2 +- src/smpi/colls/alltoall/alltoall-pair.cpp | 2 +- src/smpi/colls/alltoall/alltoall-rdb.cpp | 2 +- .../alltoall/alltoall-ring-light-barrier.cpp | 2 +- .../alltoall/alltoall-ring-mpi-barrier.cpp | 2 +- .../alltoall/alltoall-ring-one-barrier.cpp | 2 +- src/smpi/colls/alltoall/alltoall-ring.cpp | 2 +- src/smpi/colls/alltoallv/alltoallv-bruck.cpp | 2 +- .../alltoallv/alltoallv-ompi-basic-linear.cpp | 2 +- .../alltoallv-pair-light-barrier.cpp | 2 +- .../alltoallv/alltoallv-pair-mpi-barrier.cpp | 2 +- .../alltoallv/alltoallv-pair-one-barrier.cpp | 2 +- src/smpi/colls/alltoallv/alltoallv-pair.cpp | 2 +- .../alltoallv-ring-light-barrier.cpp | 2 +- .../alltoallv/alltoallv-ring-mpi-barrier.cpp | 2 +- .../alltoallv/alltoallv-ring-one-barrier.cpp | 2 +- src/smpi/colls/alltoallv/alltoallv-ring.cpp | 2 +- .../colls/barrier/barrier-mvapich2-pair.cpp | 4 +- src/smpi/colls/barrier/barrier-ompi.cpp | 5 +- src/smpi/colls/bcast/bcast-NTSB.cpp | 2 +- src/smpi/colls/bcast/bcast-NTSL-Isend.cpp | 2 +- src/smpi/colls/bcast/bcast-NTSL.cpp | 2 +- src/smpi/colls/bcast/bcast-SMP-binary.cpp | 3 +- src/smpi/colls/bcast/bcast-SMP-binomial.cpp | 2 +- src/smpi/colls/bcast/bcast-SMP-linear.cpp | 2 +- .../bcast-arrival-pattern-aware-wait.cpp | 2 +- .../bcast/bcast-arrival-pattern-aware.cpp | 2 +- .../colls/bcast/bcast-arrival-scatter.cpp | 2 +- src/smpi/colls/bcast/bcast-binomial-tree.cpp | 2 +- .../colls/bcast/bcast-flattree-pipeline.cpp | 2 +- src/smpi/colls/bcast/bcast-flattree.cpp | 2 +- src/smpi/colls/bcast/bcast-mvapich-smp.cpp | 2 +- src/smpi/colls/bcast/bcast-ompi-pipeline.cpp | 4 +- .../colls/bcast/bcast-ompi-split-bintree.cpp | 6 +- .../bcast/bcast-scatter-LR-allgather.cpp | 2 +- .../bcast/bcast-scatter-rdb-allgather.cpp | 2 +- src/smpi/colls/coll_tuned_topo.cpp | 4 +- ...{coll_tuned_topo.h => coll_tuned_topo.hpp} | 2 +- .../{colls_private.h => colls_private.hpp} | 4 +- src/smpi/colls/gather/gather-mvapich.cpp | 6 +- src/smpi/colls/gather/gather-ompi.cpp | 4 +- src/smpi/colls/reduce/reduce-NTSL.cpp | 2 +- .../reduce/reduce-arrival-pattern-aware.cpp | 2 +- src/smpi/colls/reduce/reduce-binomial.cpp | 2 +- src/smpi/colls/reduce/reduce-flat-tree.cpp | 2 +- .../colls/reduce/reduce-mvapich-knomial.cpp | 2 +- .../colls/reduce/reduce-mvapich-two-level.cpp | 2 +- src/smpi/colls/reduce/reduce-ompi.cpp | 4 +- src/smpi/colls/reduce/reduce-rab.cpp | 2 +- .../colls/reduce/reduce-scatter-gather.cpp | 2 +- .../reduce_scatter/reduce_scatter-mpich.cpp | 2 +- .../reduce_scatter/reduce_scatter-ompi.cpp | 4 +- .../scatter/scatter-mvapich-two-level.cpp | 2 +- src/smpi/colls/scatter/scatter-ompi.cpp | 5 +- src/smpi/colls/smpi_automatic_selector.cpp | 2 +- src/smpi/colls/smpi_default_selector.cpp | 2 +- src/smpi/colls/smpi_intel_mpi_selector.cpp | 2 +- src/smpi/colls/smpi_mpich_selector.cpp | 2 +- src/smpi/colls/smpi_mvapich2_selector.cpp | 4 +- ....h => smpi_mvapich2_selector_stampede.hpp} | 0 src/smpi/colls/smpi_openmpi_selector.cpp | 2 +- src/smpi/include/private.hpp | 4 +- src/smpi/include/smpi_process.hpp | 2 +- src/smpi/internals/smpi_global.cpp | 4 +- src/smpi/internals/smpi_process.cpp | 5 +- src/smpi/mpi/smpi_comm.cpp | 2 +- src/smpi/mpi/smpi_status.cpp | 2 +- src/surf/StorageImpl.cpp | 2 +- src/surf/cpu_interface.cpp | 2 +- src/surf/instr_routing.cpp | 2 +- src/surf/instr_surf.cpp | 4 +- src/surf/maxmin.cpp | 2 +- src/surf/maxmin_private.hpp | 2 +- src/surf/network_cm02.cpp | 2 +- src/surf/network_ns3.cpp | 4 +- src/surf/network_ns3.hpp | 2 +- .../{ns3_interface.h => ns3_interface.hpp} | 4 +- src/surf/ns3/ns3_simulator.cpp | 2 +- .../{ns3_simulator.h => ns3_simulator.hpp} | 6 +- src/surf/sg_platf.cpp | 2 +- src/surf/surf_c_bindings.cpp | 2 +- src/surf/surf_interface.cpp | 2 +- src/surf/surf_interface.hpp | 2 +- src/surf/{surf_private.h => surf_private.hpp} | 6 +- src/surf/trace_mgr.cpp | 2 +- src/surf/xml/surfxml_parseplatf.cpp | 4 +- .../mc/dwarf-expression/dwarf-expression.cpp | 2 +- teshsuite/mc/dwarf/dwarf.cpp | 2 +- teshsuite/surf/lmm_usage/lmm_usage.cpp | 2 +- teshsuite/surf/maxmin_bench/maxmin_bench.cpp | 2 +- tools/cmake/DefinePackages.cmake | 66 +++++++++---------- tools/cmake/MaintainerMode.cmake | 6 +- 277 files changed, 495 insertions(+), 505 deletions(-) rename src/bindings/java/{jmsg.h => jmsg.hpp} (98%) rename src/bindings/java/{jmsg_as.h => jmsg_as.hpp} (97%) rename src/bindings/java/{jxbt_utilities.h => jxbt_utilities.hpp} (98%) rename src/bindings/lua/{lua_private.h => lua_private.hpp} (85%) rename src/bindings/lua/{lua_utils.h => lua_utils.hpp} (95%) rename src/bindings/lua/{simgrid_lua.h => simgrid_lua.hpp} (95%) rename src/include/surf/{maxmin.h => maxmin.hpp} (99%) rename src/instr/{instr_private.h => instr_private.hpp} (99%) rename src/instr/{instr_smpi.h => instr_smpi.hpp} (96%) rename src/mc/{mc_exit.h => mc_exit.hpp} (100%) rename src/mc/{mc_mmu.h => mc_mmu.hpp} (96%) rename src/mc/{mc_private.h => mc_private.hpp} (96%) rename src/mc/{mc_record.h => mc_record.hpp} (94%) rename src/mc/{mc_request.h => mc_request.hpp} (87%) rename src/mc/{mc_safety.h => mc_safety.hpp} (87%) rename src/mc/{mc_smx.h => mc_smx.hpp} (96%) rename src/mc/{mc_snapshot.h => mc_snapshot.hpp} (98%) rename src/mc/{mc_state.h => mc_state.hpp} (97%) rename src/mc/{mc_unw.h => mc_unw.hpp} (98%) rename src/msg/{msg_private.h => msg_private.hpp} (99%) rename src/simix/{popping_accessors.h => popping_accessors.hpp} (99%) rename src/simix/{popping_private.h => popping_private.hpp} (97%) rename src/simix/{smx_host_private.h => smx_host_private.hpp} (95%) rename src/simix/{smx_io_private.h => smx_io_private.hpp} (86%) rename src/simix/{smx_network_private.h => smx_network_private.hpp} (93%) rename src/simix/{smx_private.h => smx_private.hpp} (98%) rename src/smpi/colls/{coll_tuned_topo.h => coll_tuned_topo.hpp} (99%) rename src/smpi/colls/{colls_private.h => colls_private.hpp} (88%) rename src/smpi/colls/{smpi_mvapich2_selector_stampede.h => smpi_mvapich2_selector_stampede.hpp} (100%) rename src/surf/ns3/{ns3_interface.h => ns3_interface.hpp} (95%) rename src/surf/ns3/{ns3_simulator.h => ns3_simulator.hpp} (93%) rename src/surf/{surf_private.h => surf_private.hpp} (95%) diff --git a/doc/doxygen/module-smpi.doc b/doc/doxygen/module-smpi.doc index ae3d11554e..238ba47b1e 100644 --- a/doc/doxygen/module-smpi.doc +++ b/doc/doxygen/module-smpi.doc @@ -412,7 +412,7 @@ changed to use smpi version of the calls instead (MPI_Send will become smpi_mpi_ Example: adding a "pair" version of the Alltoall collective. - - Implement it in a file called alltoall-pair.c in the src/smpi/colls folder. This file should include colls_private.h. + - Implement it in a file called alltoall-pair.c in the src/smpi/colls folder. This file should include colls_private.hpp. - The name of the new algorithm function should be smpi_coll_tuned_alltoall_pair, with the same signature as MPI_Alltoall. diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp index 7865d16d6d..6ddcd9209b 100644 --- a/src/bindings/java/JavaContext.cpp +++ b/src/bindings/java/JavaContext.cpp @@ -6,8 +6,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "JavaContext.hpp" -#include "jxbt_utilities.h" -#include "src/simix/smx_private.h" +#include "jxbt_utilities.hpp" +#include "src/simix/smx_private.hpp" #include "xbt/ex.hpp" #include diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp index 6ebaad4b76..7af0b5ea8b 100644 --- a/src/bindings/java/JavaContext.hpp +++ b/src/bindings/java/JavaContext.hpp @@ -12,10 +12,10 @@ #include #include "simgrid/simix.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "xbt/xbt_os_thread.h" -#include "jmsg.h" +#include "jmsg.hpp" namespace simgrid { namespace kernel { diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 1bb1487fd6..804cc7b820 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -15,15 +15,15 @@ #include "simgrid/s4u/Host.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "jmsg_process.h" -#include "jmsg_as.h" +#include "jmsg_as.hpp" #include "jmsg_host.h" #include "jmsg_storage.h" #include "jmsg_task.h" -#include "jxbt_utilities.h" -#include "jmsg.h" +#include "jxbt_utilities.hpp" +#include "jmsg.hpp" #include "JavaContext.hpp" diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.hpp similarity index 98% rename from src/bindings/java/jmsg.h rename to src/bindings/java/jmsg.hpp index c0e7e2d0e7..9e6996a6c3 100644 --- a/src/bindings/java/jmsg.h +++ b/src/bindings/java/jmsg.hpp @@ -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. */ -#ifndef MSG4JAVA_H -#define MSG4JAVA_H +#ifndef JMSG_HPP +#define JMSG_HPP #include #include #include diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index 41ed0b39b8..cdf07b7ed4 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_as.h" +#include "jmsg_as.hpp" #include "jmsg_host.h" -#include "jxbt_utilities.h" -#include "jmsg.h" +#include "jxbt_utilities.hpp" +#include "jmsg.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.hpp similarity index 97% rename from src/bindings/java/jmsg_as.h rename to src/bindings/java/jmsg_as.hpp index 89ac082910..2d9e1cb304 100644 --- a/src/bindings/java/jmsg_as.h +++ b/src/bindings/java/jmsg_as.hpp @@ -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. */ -#ifndef MSG_JAS_H -#define MSG_JAS_H +#ifndef JMSG_AS_HPP +#define JMSG_AS_HPP #include #include "simgrid/msg.h" diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index 47f14d60a6..011d39d67c 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.h" -#include "jmsg.h" +#include "jxbt_utilities.hpp" +#include "jmsg.hpp" #include #include diff --git a/src/bindings/java/jmsg_file.cpp b/src/bindings/java/jmsg_file.cpp index 8243f6ab5c..b1b8377218 100644 --- a/src/bindings/java/jmsg_file.cpp +++ b/src/bindings/java/jmsg_file.cpp @@ -1,12 +1,12 @@ /* Java bindings of the file API. */ -/* Copyright (c) 2012-2015. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */ /* 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 "jmsg_file.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" SG_BEGIN_DECL() diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index a255e2e147..a5a8b91cd4 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -9,9 +9,9 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_host.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" #include "jmsg_storage.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index ec8c032c43..023e19907f 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -9,9 +9,9 @@ #include "jmsg_process.h" -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_host.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" #include "JavaContext.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_rngstream.cpp b/src/bindings/java/jmsg_rngstream.cpp index 0bb54a2a22..b294843857 100644 --- a/src/bindings/java/jmsg_rngstream.cpp +++ b/src/bindings/java/jmsg_rngstream.cpp @@ -8,7 +8,7 @@ #include "xbt/sysdep.h" #include "jmsg_rngstream.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" SG_BEGIN_DECL() diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp index 7b5003f6c1..f421d022e5 100644 --- a/src/bindings/java/jmsg_storage.cpp +++ b/src/bindings/java/jmsg_storage.cpp @@ -7,9 +7,9 @@ #include "simgrid/msg.h" -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_storage.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_synchro.cpp b/src/bindings/java/jmsg_synchro.cpp index 9749bf32bc..51d3cba00e 100644 --- a/src/bindings/java/jmsg_synchro.cpp +++ b/src/bindings/java/jmsg_synchro.cpp @@ -7,9 +7,9 @@ #include -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_synchro.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" #include "xbt/synchro.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index eb5ca2ddb6..77f5872085 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -7,11 +7,11 @@ #include "simgrid/s4u/Host.hpp" -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_host.h" #include "jmsg_task.h" #include "jmsg_process.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 76b0dcec4b..b1cd76ad5e 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -7,7 +7,7 @@ #include "jmsg_vm.h" #include "jmsg_host.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "xbt/ex.hpp" diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp index a5e6ed1ab7..6756075308 100644 --- a/src/bindings/java/jxbt_utilities.cpp +++ b/src/bindings/java/jxbt_utilities.cpp @@ -6,7 +6,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" -#include "jxbt_utilities.h" +#include "jxbt_utilities.hpp" #include /* abort */ diff --git a/src/bindings/java/jxbt_utilities.h b/src/bindings/java/jxbt_utilities.hpp similarity index 98% rename from src/bindings/java/jxbt_utilities.h rename to src/bindings/java/jxbt_utilities.hpp index 067a654cd2..4b65d60d8a 100644 --- a/src/bindings/java/jxbt_utilities.h +++ b/src/bindings/java/jxbt_utilities.hpp @@ -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. */ -#ifndef JXBT_UTILITY_H -#define JXBT_UTILITY_H +#ifndef JXBT_UTILITIES_HPP +#define JXBT_UTILITIES_HPP #include #include diff --git a/src/bindings/lua/lua_debug.cpp b/src/bindings/lua/lua_debug.cpp index c02d921fdf..ddf1fb41b8 100644 --- a/src/bindings/lua/lua_debug.cpp +++ b/src/bindings/lua/lua_debug.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2010-2016. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. * * 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. */ - /* * This file contains functions that aid users to debug their lua scripts; for instance, * tables can be easily output and values are represented in a human-readable way. (For instance, @@ -15,7 +14,7 @@ extern "C" { #include } -#include "lua_utils.h" +#include "lua_utils.hpp" #include "xbt.h" XBT_LOG_NEW_DEFAULT_CATEGORY(lua_debug, "Lua bindings (helper functions)"); diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp index 9220e67f21..f511ec38d6 100644 --- a/src/bindings/lua/lua_host.cpp +++ b/src/bindings/lua/lua_host.cpp @@ -5,7 +5,7 @@ /* SimGrid Lua bindings */ -#include "lua_private.h" +#include "lua_private.hpp" #include "simgrid/s4u/Host.hpp" extern "C" { #include diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index cddfe8aaa4..90c72c6490 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -5,7 +5,7 @@ /* SimGrid Lua bindings */ -#include "lua_private.h" +#include "lua_private.hpp" #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" @@ -16,7 +16,7 @@ extern "C" { #include } -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" #include #include #include diff --git a/src/bindings/lua/lua_private.h b/src/bindings/lua/lua_private.hpp similarity index 85% rename from src/bindings/lua/lua_private.h rename to src/bindings/lua/lua_private.hpp index 0010302204..e51fae30fd 100644 --- a/src/bindings/lua/lua_private.h +++ b/src/bindings/lua/lua_private.hpp @@ -1,15 +1,15 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ /* 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. */ /* SimGrid Lua bindings */ -#ifndef LUA_PRIVATE_H -#define LUA_PRIVATE_H +#ifndef LUA_PRIVATE_HPP +#define LUA_PRIVATE_HPP #include "simgrid/msg.h" -#include "simgrid_lua.h" +#include "simgrid_lua.hpp" extern "C" { diff --git a/src/bindings/lua/lua_utils.h b/src/bindings/lua/lua_utils.hpp similarity index 95% rename from src/bindings/lua/lua_utils.h rename to src/bindings/lua/lua_utils.hpp index 203c0e4d3d..a5e060f73b 100644 --- a/src/bindings/lua/lua_utils.h +++ b/src/bindings/lua/lua_utils.hpp @@ -5,8 +5,8 @@ /* SimGrid Lua helper functions */ -#ifndef LUA_UTILS_H -#define LUA_UTILS_H +#ifndef LUA_UTILS_HPP +#define LUA_UTILS_HPP extern "C" { diff --git a/src/bindings/lua/simgrid_lua.cpp b/src/bindings/lua/simgrid_lua.cpp index 846d2b096a..1bca949d14 100644 --- a/src/bindings/lua/simgrid_lua.cpp +++ b/src/bindings/lua/simgrid_lua.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,8 +6,8 @@ /* SimGrid Lua bindings */ -#include "lua_private.h" -#include "lua_utils.h" +#include "lua_private.hpp" +#include "lua_utils.hpp" #include "src/surf/xml/platf.hpp" diff --git a/src/bindings/lua/simgrid_lua.h b/src/bindings/lua/simgrid_lua.hpp similarity index 95% rename from src/bindings/lua/simgrid_lua.h rename to src/bindings/lua/simgrid_lua.hpp index f95d620ab7..d9d5edb238 100644 --- a/src/bindings/lua/simgrid_lua.h +++ b/src/bindings/lua/simgrid_lua.hpp @@ -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. */ -#ifndef SIMGRID_LUA_H -#define SIMGRID_LUA_H +#ifndef SIMGRID_LUA_HPP +#define SIMGRID_LUA_HPP extern "C" { #include diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.hpp similarity index 99% rename from src/include/surf/maxmin.h rename to src/include/surf/maxmin.hpp index df7571f3dc..d635efd762 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.hpp @@ -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. */ -#ifndef SURF_MAXMIN_H -#define SURF_MAXMIN_H +#ifndef SURF_MAXMIN_HPP +#define SURF_MAXMIN_HPP #include "src/internal_config.h" #include "xbt/misc.h" diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 44077df465..e6f06de5cb 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -3,7 +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 "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "surf/surf.h" #include #include diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 121b6f912b..71762f419b 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -1,14 +1,14 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. */ /* 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_config.h" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" #include "surf/surf.h" #include diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 0ab2877c7e..9922c8ab06 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -8,7 +8,7 @@ #include "surf/surf.h" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp index 4f49363a9b..5a85e12405 100644 --- a/src/instr/instr_paje_header.cpp +++ b/src/instr/instr_paje_header.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2010, 2012-2017. The SimGrid Team. * All rights reserved. */ /* 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.h" +#include "src/instr/instr_private.hpp" #include "simgrid/sg_config.h" 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 29c3588c53..e6825968f7 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.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.h" -#include "src/instr/instr_smpi.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 */ diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index e8b59fa77a..b1e5532c9c 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.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 "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)"); diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp index e4a1f7b526..5a4d2699c1 100644 --- a/src/instr/instr_paje_values.cpp +++ b/src/instr/instr_paje_values.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2015. The SimGrid Team. +/* Copyright (c) 2012-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,7 +6,7 @@ #include -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)"); diff --git a/src/instr/instr_private.h b/src/instr/instr_private.hpp similarity index 99% rename from src/instr/instr_private.h rename to src/instr/instr_private.hpp index 039c5801e3..98b34ce26f 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.hpp @@ -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. */ -#ifndef INSTR_PRIVATE_H_ -#define INSTR_PRIVATE_H_ +#ifndef INSTR_PRIVATE_HPP +#define INSTR_PRIVATE_HPP #include diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp index 374f569f3a..ead0ea4060 100644 --- a/src/instr/instr_resource_utilization.cpp +++ b/src/instr/instr_resource_utilization.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 "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include #include diff --git a/src/instr/instr_smpi.h b/src/instr/instr_smpi.hpp similarity index 96% rename from src/instr/instr_smpi.h rename to src/instr/instr_smpi.hpp index cd6faa5f21..e212b46e81 100644 --- a/src/instr/instr_smpi.h +++ b/src/instr/instr_smpi.hpp @@ -3,15 +3,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. */ -#ifndef INSTR_SMPI_H_ -#define INSTR_SMPI_H_ +#ifndef INSTR_SMPI_HPP +#define INSTR_SMPI_HPP #ifdef __cplusplus #include #endif #include "smpi/smpi.h" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" SG_BEGIN_DECL() diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index 33d31e7d03..c7517bf5ed 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -7,7 +7,7 @@ #include "simgrid/modelchecker.h" #include "src/mc/mc_replay.h" -#include "src/simix/smx_network_private.h" +#include "src/simix/smx_network_private.hpp" #include "src/surf/surf_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_network); diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp index aee76bc532..95a4e38e6a 100644 --- a/src/kernel/activity/ExecImpl.cpp +++ b/src/kernel/activity/ExecImpl.cpp @@ -6,7 +6,7 @@ #include "simgrid/s4u/Host.hpp" #include "src/kernel/activity/ExecImpl.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" #include "src/surf/surf_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp index 88cd15b8fb..7b8f3d552f 100644 --- a/src/kernel/activity/SleepImpl.cpp +++ b/src/kernel/activity/SleepImpl.cpp @@ -9,7 +9,7 @@ #include "src/kernel/context/Context.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/popping_private.h" +#include "src/simix/popping_private.hpp" #include "src/surf/surf_interface.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp index 7e8ea86b59..65ac052ee2 100644 --- a/src/kernel/activity/SynchroIo.cpp +++ b/src/kernel/activity/SynchroIo.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* 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/kernel/activity/SynchroIo.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/surf/surf_interface.hpp" void simgrid::kernel::activity::IoImpl::suspend() diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp index bf07805700..1a9dae5cbc 100644 --- a/src/kernel/context/Context.cpp +++ b/src/kernel/context/Context.cpp @@ -6,7 +6,7 @@ #include "mc/mc.h" #include "src/kernel/context/Context.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" /** * @brief creates a new context for a user level process diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index c184df4a34..c2ac93eaa3 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -14,12 +14,12 @@ #include #include "simgrid/simix.h" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/internal_config.h" -#include "src/simix/popping_private.h" -#include "src/simix/smx_host_private.h" -#include "src/simix/smx_io_private.h" -#include "src/simix/smx_network_private.h" +#include "src/simix/popping_private.hpp" +#include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_io_private.hpp" +#include "src/simix/smx_network_private.hpp" #include "src/simix/smx_synchro_private.hpp" #include "surf/surf.h" #include "xbt/base.h" diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 8e1eabd20d..03c81c5896 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -14,7 +14,7 @@ #include #include -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/internal_config.h" #include "src/kernel/context/ContextBoost.hpp" diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 8e83fa50b5..17f77d5f7c 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -7,7 +7,7 @@ #include "xbt/parmap.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "mc/mc.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp index 8e9ee722d6..2cbeeafd4e 100644 --- a/src/kernel/context/ContextThread.cpp +++ b/src/kernel/context/ContextThread.cpp @@ -7,7 +7,7 @@ #include #include "xbt/function_types.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/internal_config.h" /* loads context system definitions */ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index 0ee4c14a1c..ae143b8a7e 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -10,7 +10,7 @@ #include "mc/mc.h" #include "src/mc/mc_ignore.h" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "xbt/parmap.hpp" /** Many integers are needed to store a pointer diff --git a/src/kernel/future.cpp b/src/kernel/future.cpp index 4252161b12..4eb99001b3 100644 --- a/src/kernel/future.cpp +++ b/src/kernel/future.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. +/* Copyright (c) 2016-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,7 +8,7 @@ #include -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" namespace simgrid { namespace kernel { diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp index fe55a37adf..81f2cbceae 100644 --- a/src/mc/DwarfExpression.cpp +++ b/src/mc/DwarfExpression.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,7 +10,7 @@ #include #include -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/mc/LocationList.hpp" #include "src/mc/AddressSpace.hpp" #include "src/mc/Frame.hpp" diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 8de1553f8c..4c47db57f7 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. +/* Copyright (c) 2008-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -26,9 +26,9 @@ #include "src/mc/PageStore.hpp" #include "src/mc/Transition.hpp" #include "src/mc/checker/Checker.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" #include "src/mc/remote/mc_protocol.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker"); diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp index b258b16f5b..5f2d921689 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -20,7 +20,7 @@ #include "src/mc/PageStore.hpp" -#include "src/mc/mc_mmu.h" +#include "src/mc/mc_mmu.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot"); diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp index 80332eaebc..d0c3432bce 100644 --- a/src/mc/PageStore.hpp +++ b/src/mc/PageStore.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. +/* Copyright (c) 2015-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,7 +15,7 @@ #include "xbt/base.h" -#include "src/mc/mc_mmu.h" +#include "src/mc/mc_mmu.hpp" #include "src/mc/mc_forward.hpp" namespace simgrid { diff --git a/src/mc/RegionSnapshot.cpp b/src/mc/RegionSnapshot.cpp index c1206077bb..445daedb89 100644 --- a/src/mc/RegionSnapshot.cpp +++ b/src/mc/RegionSnapshot.cpp @@ -12,7 +12,7 @@ #endif #include "mc/mc.h" -#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_snapshot.hpp" #include "src/mc/ChunkedData.hpp" #include "src/mc/RegionSnapshot.hpp" diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index ce79e7c120..d1c00c0d99 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -16,8 +16,8 @@ #include #include "src/mc/Session.hpp" -#include "src/mc/mc_state.h" -#include "src/mc/mc_private.h" +#include "src/mc/mc_state.hpp" +#include "src/mc/mc_private.hpp" #include "src/mc/checker/Checker.hpp" #include "src/smpi/include/private.hpp" diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp index a85f2828fa..cb22a5757e 100644 --- a/src/mc/VisitedState.cpp +++ b/src/mc/VisitedState.cpp @@ -15,8 +15,8 @@ #include "src/mc/VisitedState.hpp" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/remote/RemoteClient.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms"); diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp index a9a1b821ed..ebc6dcb3d2 100644 --- a/src/mc/VisitedState.hpp +++ b/src/mc/VisitedState.hpp @@ -11,8 +11,8 @@ #include -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_state.h" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_state.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/checker/Checker.hpp b/src/mc/checker/Checker.hpp index ce27ab2f43..3e0cec84bb 100644 --- a/src/mc/checker/Checker.hpp +++ b/src/mc/checker/Checker.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. +/* Copyright (c) 2016-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,7 +12,7 @@ #include #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_record.h" +#include "src/mc/mc_record.hpp" #include "src/mc/Session.hpp" namespace simgrid { diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index c4dd392077..6c50eb7eea 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -13,12 +13,12 @@ #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/CommunicationDeterminismChecker.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_state.h" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_state.hpp" #include "src/mc/remote/Client.hpp" #include "smpi_request.hpp" diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index 42ce4dc61e..6eef33082e 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -23,13 +23,13 @@ #include "src/mc/Session.hpp" #include "src/mc/Transition.hpp" #include "src/mc/checker/LivenessChecker.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/remote/Client.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index ed4994eaf0..93dc6cb755 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -17,7 +17,7 @@ #include #include #include -#include "src/mc/mc_state.h" +#include "src/mc/mc_state.hpp" #include "src/mc/checker/Checker.hpp" SG_BEGIN_DECL() diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index e360a1e7f6..0003a8fb28 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -17,11 +17,11 @@ #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/SafetyChecker.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/xbt/mmalloc/mmprivate.h" diff --git a/src/mc/checker/SafetyChecker.hpp b/src/mc/checker/SafetyChecker.hpp index ffc27f1cfe..f299d9b19c 100644 --- a/src/mc/checker/SafetyChecker.hpp +++ b/src/mc/checker/SafetyChecker.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2016. The SimGrid Team. +/* Copyright (c) 2008-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,7 +15,7 @@ #include "src/mc/VisitedState.hpp" #include "src/mc/checker/Checker.hpp" #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_safety.h" +#include "src/mc/mc_safety.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp index 1b57a3f97f..45f1201839 100644 --- a/src/mc/checker/simgrid_mc.cpp +++ b/src/mc/checker/simgrid_mc.cpp @@ -23,9 +23,9 @@ #include "src/mc/checker/Checker.hpp" #include "src/mc/mc_base.h" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_safety.h" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_safety.hpp" #include "src/mc/remote/mc_protocol.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc"); diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 03f96aec94..ce28dc7de2 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -30,14 +30,14 @@ #endif #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_smx.h" +#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/Variable.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" #include "src/mc/mc_dwarf.hpp" #include "src/mc/Type.hpp" diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index f2b9548a60..dbafa01632 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -8,7 +8,7 @@ #include "mc/mc.h" #include "src/mc/mc_base.h" #include "src/mc/mc_replay.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 44d50918eb..055a4ee4c1 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -16,26 +16,26 @@ #endif #include "src/internal_config.h" -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/smpi/include/private.h" #include "xbt/mmalloc.h" #include "xbt/module.h" #include "src/xbt/mmalloc/mmprivate.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include #include -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include #include "src/mc/mc_hash.hpp" -#include "src/mc/mc_mmu.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_unw.hpp" #include "src/mc/remote/mc_protocol.h" #include "src/mc/RegionSnapshot.hpp" diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp index fee19b6d45..aab4ac6083 100644 --- a/src/mc/mc_client_api.cpp +++ b/src/mc/mc_client_api.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. +/* Copyright (c) 2008-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,8 +10,8 @@ #include "src/mc/ModelChecker.hpp" #include "src/mc/mc_ignore.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp index cb7029cfb8..48608a8e20 100644 --- a/src/mc/mc_comm_pattern.cpp +++ b/src/mc/mc_comm_pattern.cpp @@ -11,7 +11,7 @@ #include "src/mc/checker/CommunicationDeterminismChecker.hpp" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_smx.hpp" #include "src/mc/mc_xbt.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_comm_pattern.hpp b/src/mc/mc_comm_pattern.hpp index 0d99b67520..afd3aa23c6 100644 --- a/src/mc/mc_comm_pattern.hpp +++ b/src/mc/mc_comm_pattern.hpp @@ -11,7 +11,7 @@ #include "smpi/smpi.h" #include "xbt/dynar.h" -#include "src/mc/mc_state.h" +#include "src/mc/mc_state.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index e61201c5b0..d62c068c2b 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -14,11 +14,11 @@ #include #if SIMGRID_HAVE_MC -#include "src/mc/mc_safety.h" -#include "src/mc/mc_private.h" +#include "src/mc/mc_safety.hpp" +#include "src/mc/mc_private.hpp" #endif -#include "src/mc/mc_record.h" +#include "src/mc/mc_record.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker"); diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index c7a785bcaa..5330a6bfd3 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -25,7 +25,7 @@ #include "xbt/sysdep.h" #include -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/mc/mc_dwarf.hpp" #include "src/mc/ObjectInformation.hpp" diff --git a/src/mc/mc_exit.h b/src/mc/mc_exit.hpp similarity index 100% rename from src/mc/mc_exit.h rename to src/mc/mc_exit.hpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 0204bbd427..0e86c470ec 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -31,17 +31,17 @@ #if SIMGRID_HAVE_MC #include "src/mc/checker/Checker.hpp" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_safety.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_safety.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_unw.hpp" #include #endif #include "src/mc/Transition.hpp" -#include "src/mc/mc_record.h" +#include "src/mc/mc_record.hpp" #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" diff --git a/src/mc/mc_hash.cpp b/src/mc/mc_hash.cpp index d537cfef30..082e8773e3 100644 --- a/src/mc/mc_hash.cpp +++ b/src/mc/mc_hash.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,8 +10,8 @@ #include "xbt/log.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" #include "mc/datatypes.h" #include "src/mc/mc_hash.hpp" #include diff --git a/src/mc/mc_member.cpp b/src/mc/mc_member.cpp index ff4c77f115..a8bec1f540 100644 --- a/src/mc/mc_member.cpp +++ b/src/mc/mc_member.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2017. The SimGrid Team. * All rights reserved. */ /* 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.h" +#include "src/mc/mc_private.hpp" #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 d0bb0a6b55..28ff84b860 100644 --- a/src/mc/mc_memory.cpp +++ b/src/mc/mc_memory.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. +/* Copyright (c) 2008-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,7 +10,7 @@ #include "xbt/log.h" #include "mc/mc.h" -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/xbt/mmalloc/mmprivate.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc, diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.hpp similarity index 96% rename from src/mc/mc_mmu.h rename to src/mc/mc_mmu.hpp index c7d5b976f1..a6de7acebb 100644 --- a/src/mc/mc_mmu.h +++ b/src/mc/mc_mmu.hpp @@ -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. */ -#ifndef SIMGRID_MC_MMU_H -#define SIMGRID_MC_MMU_H +#ifndef SIMGRID_MC_MMU_HPP +#define SIMGRID_MC_MMU_HPP #include "xbt/misc.h" // xbt_pagesize... diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp index 5c6f2bf96d..dacbbb6841 100644 --- a/src/mc/mc_page_snapshot.cpp +++ b/src/mc/mc_page_snapshot.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,9 +10,9 @@ #include // pread, pwrite #include "src/mc/PageStore.hpp" -#include "src/mc/mc_mmu.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_snapshot.hpp" #include #include "src/mc/ChunkedData.hpp" diff --git a/src/mc/mc_private.h b/src/mc/mc_private.hpp similarity index 96% rename from src/mc/mc_private.h rename to src/mc/mc_private.hpp index 0bdeb53563..64a1c9a7da 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.hpp @@ -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. */ -#ifndef SIMGRID_MC_PRIVATE_H -#define SIMGRID_MC_PRIVATE_H +#ifndef SIMGRID_MC_PRIVATE_HPP +#define SIMGRID_MC_PRIVATE_HPP #include "mc/mc.h" #include "xbt/automaton.h" diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index a8dfdb11da..e61504e00a 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -19,18 +19,18 @@ #include "src/kernel/context/Context.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/mc/mc_replay.h" -#include "src/mc/mc_record.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.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_state.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_state.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/checker/Checker.hpp" #endif diff --git a/src/mc/mc_record.h b/src/mc/mc_record.hpp similarity index 94% rename from src/mc/mc_record.h rename to src/mc/mc_record.hpp index 56a341008c..698d824819 100644 --- a/src/mc/mc_record.h +++ b/src/mc/mc_record.hpp @@ -3,7 +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. */ -/** \file mc_record.h +/** \file mc_record.hpp * * This file contains the MC replay/record functionnality. * A MC path may be recorded by using ``-cfg=model-check/record:1`'`. @@ -14,8 +14,8 @@ * passed to the application (without the MC specific arguments). */ -#ifndef SIMGRID_MC_RECORD_H -#define SIMGRID_MC_RECORD_H +#ifndef SIMGRID_MC_RECORD_HPP +#define SIMGRID_MC_RECORD_HPP #include "src/mc/Transition.hpp" #include "xbt/base.h" diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 59ccaa9f5a..e4fbdf6892 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -7,8 +7,8 @@ #include "src/include/mc/mc.h" #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/mc/mc_xbt.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_request.h b/src/mc/mc_request.hpp similarity index 87% rename from src/mc/mc_request.h rename to src/mc/mc_request.hpp index f7085c660e..23c39c8ef1 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.hpp @@ -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. */ -#ifndef SIMGRID_MC_REQUEST_H -#define SIMGRID_MC_REQUEST_H +#ifndef SIMGRID_MC_REQUEST_HPP +#define SIMGRID_MC_REQUEST_HPP -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" namespace simgrid { namespace mc { diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.hpp similarity index 87% rename from src/mc/mc_safety.h rename to src/mc/mc_safety.hpp index 2c31b5d76d..97c939c009 100644 --- a/src/mc/mc_safety.h +++ b/src/mc/mc_safety.hpp @@ -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. */ -#ifndef SIMGRID_MC_SAFETY_H -#define SIMGRID_MC_SAFETY_H +#ifndef SIMGRID_MC_SAFETY_HPP +#define SIMGRID_MC_SAFETY_HPP #include "xbt/base.h" diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index c37252a531..044939cb61 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -5,7 +5,7 @@ #include "simgrid/s4u/Host.hpp" -#include "src/mc/mc_smx.h" +#include "src/mc/mc_smx.hpp" #include "src/mc/ModelChecker.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.hpp similarity index 96% rename from src/mc/mc_smx.h rename to src/mc/mc_smx.hpp index be72eaa617..d9ca09d103 100644 --- a/src/mc/mc_smx.h +++ b/src/mc/mc_smx.hpp @@ -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. */ -#ifndef SIMGRID_MC_SMX_H -#define SIMGRID_MC_SMX_H +#ifndef SIMGRID_MC_SMX_HPP +#define SIMGRID_MC_SMX_HPP #include "src/mc/remote/RemoteClient.hpp" diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp index 11dba265f6..c3a1cb8a9b 100644 --- a/src/mc/mc_snapshot.cpp +++ b/src/mc/mc_snapshot.cpp @@ -15,9 +15,9 @@ #include "src/internal_config.h" #include "src/smpi/include/private.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_mmu.h" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_mmu.hpp" #include "src/mc/PageStore.hpp" extern "C" { @@ -201,9 +201,9 @@ const void* Snapshot::read_bytes(void* buffer, std::size_t size, #include -#include "src/mc/mc_private.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_mmu.h" +#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.h b/src/mc/mc_snapshot.hpp similarity index 98% rename from src/mc/mc_snapshot.h rename to src/mc/mc_snapshot.hpp index 1b1c7c19e6..3a86a2042c 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.hpp @@ -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. */ -#ifndef SIMGRID_MC_SNAPSHOT_H -#define SIMGRID_MC_SNAPSHOT_H +#ifndef SIMGRID_MC_SNAPSHOT_HPP +#define SIMGRID_MC_SNAPSHOT_HPP #include #include @@ -14,7 +14,7 @@ #include "src/mc/ModelChecker.hpp" #include "src/mc/RegionSnapshot.hpp" #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_unw.hpp" SG_BEGIN_DECL() diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 0bce019d43..3fce2dfa4d 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -12,12 +12,12 @@ #include "src/mc/Transition.hpp" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_state.h" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_state.hpp" #include "src/mc/mc_xbt.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_state.h b/src/mc/mc_state.hpp similarity index 97% rename from src/mc/mc_state.h rename to src/mc/mc_state.hpp index 7e6a78d31b..e9b0d7b184 100644 --- a/src/mc/mc_state.h +++ b/src/mc/mc_state.hpp @@ -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. */ -#ifndef SIMGRID_MC_STATE_H -#define SIMGRID_MC_STATE_H +#ifndef SIMGRID_MC_STATE_HPP +#define SIMGRID_MC_STATE_HPP #include #include -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_record.h" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_record.hpp" #include "src/mc/Transition.hpp" namespace simgrid { diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp index 85b6129a3f..b85172ea16 100644 --- a/src/mc/mc_unw.cpp +++ b/src/mc/mc_unw.cpp @@ -23,7 +23,7 @@ typedef register_t greg_t; #include #include "src/mc/Frame.hpp" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_unw.hpp" #include "src/mc/remote/RemoteClient.hpp" using simgrid::mc::remote; diff --git a/src/mc/mc_unw.h b/src/mc/mc_unw.hpp similarity index 98% rename from src/mc/mc_unw.h rename to src/mc/mc_unw.hpp index 6a6b861a17..f8ae14e0c2 100644 --- a/src/mc/mc_unw.h +++ b/src/mc/mc_unw.hpp @@ -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. */ -#ifndef SIMGRID_MC_UNW_H -#define SIMGRID_MC_UNW_H +#ifndef SIMGRID_MC_UNW_HPP +#define SIMGRID_MC_UNW_HPP /** @file * Libunwind implementation for the model-checker diff --git a/src/mc/mc_unw_vmread.cpp b/src/mc/mc_unw_vmread.cpp index 97b56468a8..2777a0c56f 100644 --- a/src/mc/mc_unw_vmread.cpp +++ b/src/mc/mc_unw_vmread.cpp @@ -11,7 +11,7 @@ #include #include -#include "src/mc/mc_unw.h" +#include "src/mc/mc_unw.hpp" #include "src/mc/remote/RemoteClient.hpp" /** \file diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp index 93f0bc0cf1..362a3cd64d 100644 --- a/src/mc/remote/Client.cpp +++ b/src/mc/remote/Client.cpp @@ -19,14 +19,14 @@ #include "src/internal_config.h" -#include "src/mc/mc_request.h" +#include "src/mc/mc_request.hpp" #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" #include "src/smpi/include/private.hpp" // We won't need those once the separation MCer/MCed is complete: -#include "src/mc/mc_smx.h" +#include "src/mc/mc_smx.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic"); diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp index 74ffde104b..b2ac880b8a 100644 --- a/src/mc/remote/RemoteClient.cpp +++ b/src/mc/remote/RemoteClient.cpp @@ -31,9 +31,9 @@ #include "xbt/log.h" #include -#include "src/mc/mc_smx.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_unw.hpp" #include "src/mc/AddressSpace.hpp" #include "src/mc/ObjectInformation.hpp" diff --git a/src/mc/remote/RemoteClient.hpp b/src/mc/remote/RemoteClient.hpp index 2fc858674e..c0d6ec7dc9 100644 --- a/src/mc/remote/RemoteClient.hpp +++ b/src/mc/remote/RemoteClient.hpp @@ -26,8 +26,8 @@ #include "src/mc/remote/Channel.hpp" #include "src/mc/remote/RemotePtr.hpp" -#include "src/simix/popping_private.h" -#include "src/simix/smx_private.h" +#include "src/simix/popping_private.hpp" +#include "src/simix/smx_private.hpp" #include #include "src/xbt/memory_map.hpp" diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp index a3a69f9d24..6c396a1fe0 100644 --- a/src/msg/instr_msg_process.cpp +++ b/src/msg/instr_msg_process.cpp @@ -4,8 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Host.hpp" -#include "src/instr/instr_private.h" -#include "src/msg/msg_private.h" +#include "src/instr/instr_private.hpp" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process"); diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp index 49f94db619..4c54cf2cf8 100644 --- a/src/msg/instr_msg_task.cpp +++ b/src/msg/instr_msg_task.cpp @@ -1,12 +1,12 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2010, 2012-2017. The SimGrid Team. * All rights reserved. */ /* 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 "src/instr/instr_private.h" -#include "src/msg/msg_private.h" +#include "src/instr/instr_private.hpp" +#include "src/msg/msg_private.hpp" #include diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp index 917c86883e..dd9f3a9f30 100644 --- a/src/msg/msg_actions.cpp +++ b/src/msg/msg_actions.cpp @@ -3,7 +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 "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "xbt/replay.hpp" #include diff --git a/src/msg/msg_deployment.cpp b/src/msg/msg_deployment.cpp index a5089f6258..d8ddde4c82 100644 --- a/src/msg/msg_deployment.cpp +++ b/src/msg/msg_deployment.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* 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/msg/msg_private.h" +#include "src/msg/msg_private.hpp" SG_BEGIN_DECL() diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp index 83990658c2..4392d98bee 100644 --- a/src/msg/msg_environment.cpp +++ b/src/msg/msg_environment.cpp @@ -5,7 +5,7 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/NetZone.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #if SIMGRID_HAVE_LUA #include diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index f2f926b0bc..8d1aca601c 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -8,7 +8,7 @@ #include "instr/instr_interface.h" #include "mc/mc.h" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)"); diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index feb95778ff..c1faa1ed1a 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -6,8 +6,8 @@ #include #include "src/kernel/activity/ExecImpl.hpp" -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */ +#include "src/msg/msg_private.hpp" +#include "src/simix/smx_private.hpp" /* MSG_task_listen looks inside the rdv directly. Not clean. */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index e40c790240..844fb889d0 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -5,10 +5,9 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.h" - +#include "src/simix/smx_host_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp index eebcbc9536..269ae90076 100644 --- a/src/msg/msg_io.cpp +++ b/src/msg/msg_io.cpp @@ -6,7 +6,7 @@ #include "simgrid/s4u/File.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp index d27f199a09..394e409d54 100644 --- a/src/msg/msg_mailbox.cpp +++ b/src/msg/msg_mailbox.cpp @@ -6,7 +6,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Mailbox.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)"); diff --git a/src/msg/msg_private.h b/src/msg/msg_private.hpp similarity index 99% rename from src/msg/msg_private.h rename to src/msg/msg_private.hpp index 656d67fc6e..614994e421 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.hpp @@ -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. */ -#ifndef METASIMGRID_PRIVATE_H -#define METASIMGRID_PRIVATE_H +#ifndef MSG_PRIVATE_HPP +#define MSG_PRIVATE_HPP #include "simgrid/msg.h" diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 75a39974fb..27bef10399 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.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 "msg_private.h" +#include "msg_private.hpp" #include "simgrid/s4u/Host.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)"); diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp index 5cf06a06d7..703fbee4a3 100644 --- a/src/msg/msg_synchro.cpp +++ b/src/msg/msg_synchro.cpp @@ -6,8 +6,8 @@ #include "xbt/ex.hpp" -#include "msg_private.h" -#include "src/simix/smx_private.h" +#include "msg_private.hpp" +#include "src/simix/smx_private.hpp" #include "xbt/synchro.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)"); diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 42a69af2f3..6d925d00a4 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* 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 "msg_private.h" -#include "src/simix/smx_private.h" +#include "msg_private.hpp" +#include "src/simix/smx_private.hpp" SG_BEGIN_DECL() diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 1829b63a2a..de4310dc8e 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -11,8 +11,8 @@ #include -#include "src/instr/instr_private.h" -#include "src/msg/msg_private.h" +#include "src/instr/instr_private.hpp" +#include "src/msg/msg_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index c300f9424d..7122b9310e 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -6,7 +6,7 @@ #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 14c29fec3d..d6369ee52c 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.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 "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" #include "src/surf/cpu_cas01.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines"); diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index f3f5ab06bf..c5fa2f243a 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -11,7 +11,7 @@ #include "simgrid/s4u/Mailbox.hpp" #include "src/kernel/context/Context.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp index bfd0faad7e..bcd60c3235 100644 --- a/src/s4u/s4u_comm.cpp +++ b/src/s4u/s4u_comm.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/log.h" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 763fe9841c..904b950f76 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -14,9 +14,9 @@ #include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.hpp" #include "src/kernel/routing/NetPoint.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "xbt/log.h" diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp index 245bd5334b..5a594bcbb7 100644 --- a/src/s4u/s4u_mailbox.cpp +++ b/src/s4u/s4u_mailbox.cpp @@ -5,9 +5,9 @@ #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_network_private.h" +#include "src/simix/smx_network_private.hpp" #include "xbt/log.h" XBT_LOG_EXTERNAL_CATEGORY(s4u); diff --git a/src/s4u/s4u_mutex.cpp b/src/s4u/s4u_mutex.cpp index 5e63f24149..7e0e8520d6 100644 --- a/src/s4u/s4u_mutex.cpp +++ b/src/s4u/s4u_mutex.cpp @@ -3,7 +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 "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/simix/smx_synchro_private.hpp" #include "xbt/log.h" diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 3d528ae554..336e5a356a 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -12,7 +12,7 @@ #include "xbt/dict.h" #include "src/kernel/routing/NetPoint.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 0c10cd45fb..ee90057c2a 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -13,7 +13,7 @@ #include "xbt/mallocator.h" #include "xbt/sysdep.h" #include "surf/surf.h" -#include "surf/maxmin.h" +#include "surf/maxmin.hpp" #include "instr/instr_interface.h" #include "simgrid/simix.h" #include "simgrid/sg_config.h" diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 49d14cbada..61355a11a0 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -20,13 +20,13 @@ #include "mc/mc.h" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.h" #include "src/mc/remote/Client.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index dcdea7a9d1..a75c24ee96 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -7,7 +7,7 @@ #define SIMIX_ACTORIMPL_H #include "simgrid/s4u/Actor.hpp" -#include "src/simix/popping_private.h" +#include "src/simix/popping_private.hpp" #include "src/surf/PropertyHolder.hpp" #include "xbt/swag.h" #include diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index b26dcb7393..cb14efd423 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,7 +5,7 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -19,12 +19,12 @@ #include "simgrid/s4u/VirtualMachine.hpp" #include "simgrid/simix.hpp" #include "simgrid/simix/blocking_simcall.hpp" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/simix/smx_host_private.h" +#include "src/simix/smx_host_private.hpp" #include "xbt/ex.h" #include "xbt/functional.hpp" diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 6210e32576..2672a4a86c 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.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 "smx_private.h" +#include "smx_private.hpp" #include "xbt/xbt_os_thread.h" #if SIMGRID_HAVE_MC -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #endif #include "src/kernel/activity/CommImpl.hpp" diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.hpp similarity index 99% rename from src/simix/popping_accessors.h rename to src/simix/popping_accessors.hpp index cd425d9746..3201a9e4f6 100644 --- a/src/simix/popping_accessors.h +++ b/src/simix/popping_accessors.hpp @@ -14,7 +14,7 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include "src/simix/popping_private.h" +#include "src/simix/popping_private.hpp" static inline int simcall_process_killall__get__reset_pid(smx_simcall_t simcall) { return simgrid::simix::unmarshal(simcall->args[0]); diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 270cdc7d90..f9422519d0 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -14,7 +14,7 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include "smx_private.h" +#include "smx_private.hpp" #include "src/mc/mc_forward.hpp" #include "xbt/ex.h" #include diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp index b3c410175b..dfed3e3ff0 100644 --- a/src/simix/popping_generated.cpp +++ b/src/simix/popping_generated.cpp @@ -14,7 +14,7 @@ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :) */ -#include "smx_private.h" +#include "smx_private.hpp" #include #if SIMGRID_HAVE_MC #include "src/mc/mc_forward.hpp" diff --git a/src/simix/popping_private.h b/src/simix/popping_private.hpp similarity index 97% rename from src/simix/popping_private.h rename to src/simix/popping_private.hpp index 160e55efc4..208f6e90d4 100644 --- a/src/simix/popping_private.h +++ b/src/simix/popping_private.hpp @@ -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. */ -#ifndef SG_POPPING_PRIVATE_H -#define SG_POPPING_PRIVATE_H +#ifndef SG_POPPING_PRIVATE_HPP +#define SG_POPPING_PRIVATE_HPP #include #include @@ -74,7 +74,7 @@ SG_END_DECL() /* Defines the marshal/unmarshal functions for each type of parameters. * - * They will be used in popping_accessors.h to define the functions allowing + * They will be used in popping_accessors.hpp to define the functions allowing * to retrieve/set each parameter of each simcall. * * There is a unmarshal_raw() function, which is exactly similar to unmarshal() @@ -226,6 +226,6 @@ void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A const&... a) #endif -#include "popping_accessors.h" +#include "popping_accessors.hpp" #endif diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 88da721f11..c17fa0c92a 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -274,10 +274,10 @@ if __name__ == '__main__': # sys.exit(1) # - # smx_popping_accessors.c + # popping_accessors.hpp # - fd = header('popping_accessors.h') - fd.write('#include "src/simix/popping_private.h"'); + fd = header('popping_accessors.hpp') + fd.write('#include "src/simix/popping_private.hpp"'); handle(fd, Simcall.accessors, simcalls, simcalls_dict) fd.write( "\n\n/* The prototype of all simcall handlers, automatically generated for you */\n\n") @@ -306,7 +306,7 @@ if __name__ == '__main__': fd = header("popping_generated.cpp") - fd.write('#include "smx_private.h"\n') + fd.write('#include "smx_private.hpp"\n') fd.write('#include \n') fd.write('#if SIMGRID_HAVE_MC\n') fd.write('#include "src/mc/mc_forward.hpp"\n') @@ -359,7 +359,7 @@ if __name__ == '__main__': # smx_popping_bodies.cpp # fd = header('popping_bodies.cpp') - fd.write('#include "smx_private.h"\n') + fd.write('#include "smx_private.hpp"\n') fd.write('#include "src/mc/mc_forward.hpp"\n') fd.write('#include "xbt/ex.h"\n') fd.write('#include \n') diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index e3991634b7..217dbe561d 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -20,7 +20,7 @@ #include "xbt/log.h" #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" -#include "smx_private.h" +#include "smx_private.hpp" #include "simgrid/sg_config.h" #include "src/internal_config.h" #include "simgrid/modelchecker.h" diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index 6fad27e09a..3093fc596a 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -7,7 +7,7 @@ #include #include "simgrid/s4u/Host.hpp" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here #include diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp index d0c7d0228c..4025023187 100644 --- a/src/simix/smx_environment.cpp +++ b/src/simix/smx_environment.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2017. The SimGrid Team. * All rights reserved. */ /* 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 "smx_private.h" +#include "smx_private.hpp" #include #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 61469fb447..c1ffa87e93 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -18,7 +18,7 @@ #include "src/surf/surf_interface.hpp" #include "src/surf/xml/platf.hpp" -#include "smx_private.h" +#include "smx_private.hpp" #include "xbt/ex.h" /* ex_backtrace_display */ #include "mc/mc.h" @@ -35,12 +35,12 @@ #include "src/kernel/activity/SynchroRaw.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" #endif -#include "src/mc/mc_record.h" +#include "src/mc/mc_record.hpp" #if HAVE_SMPI #include "src/smpi/include/private.h" diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 86985418e0..855b4912d8 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* 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 "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.hpp similarity index 95% rename from src/simix/smx_host_private.h rename to src/simix/smx_host_private.hpp index d9a6b57cfe..3b45cbff2a 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.hpp @@ -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. */ -#ifndef SIMIX_HOST_PRIVATE_H -#define SIMIX_HOST_PRIVATE_H +#ifndef SIMIX_HOST_PRIVATE_HPP +#define SIMIX_HOST_PRIVATE_HPP #include #include @@ -14,7 +14,7 @@ #include #include "simgrid/simix.h" -#include "popping_private.h" +#include "popping_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 14939882e4..abe0fa8d6f 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -15,7 +15,7 @@ #include "surf/surf.h" #include "src/surf/surf_interface.hpp" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/SynchroIo.hpp" diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.hpp similarity index 86% rename from src/simix/smx_io_private.h rename to src/simix/smx_io_private.hpp index db1c66d3af..cdd26bd048 100644 --- a/src/simix/smx_io_private.h +++ b/src/simix/smx_io_private.hpp @@ -3,13 +3,13 @@ /* 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. */ -#ifndef SIMIX_IO_PRIVATE_H -#define SIMIX_IO_PRIVATE_H +#ifndef SIMIX_IO_PRIVATE_HPP +#define SIMIX_IO_PRIVATE_HPP #include #include "simgrid/simix.h" -#include "popping_private.h" +#include "popping_private.hpp" 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/simix/smx_network.cpp b/src/simix/smx_network.cpp index 591cf58a0c..e75e0b455f 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -16,7 +16,7 @@ #include "simgrid/s4u/Activity.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/mc/mc_replay.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.hpp similarity index 93% rename from src/simix/smx_network_private.h rename to src/simix/smx_network_private.hpp index 0ed901f3dc..0540c7b511 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.hpp @@ -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. */ -#ifndef SIMIX_NETWORK_PRIVATE_H -#define SIMIX_NETWORK_PRIVATE_H +#ifndef SIMIX_NETWORK_PRIVATE_HPP +#define SIMIX_NETWORK_PRIVATE_HPP #include "simgrid/s4u/Mailbox.hpp" #include "src/kernel/activity/MailboxImpl.hpp" diff --git a/src/simix/smx_private.h b/src/simix/smx_private.hpp similarity index 98% rename from src/simix/smx_private.h rename to src/simix/smx_private.hpp index f10bf4d126..1f20d8304e 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.hpp @@ -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. */ -#ifndef SIMIX_PRIVATE_H -#define SIMIX_PRIVATE_H +#ifndef SIMIX_PRIVATE_HPP +#define SIMIX_PRIVATE_HPP #include "simgrid/s4u/Actor.hpp" #include "src/kernel/context/Context.hpp" diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index c47d04c882..be7ca2fbbe 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.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 "smx_private.h" +#include "smx_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" #include diff --git a/src/smpi/colls/allgather/allgather-2dmesh.cpp b/src/smpi/colls/allgather/allgather-2dmesh.cpp index 724373c86e..d1362f6479 100644 --- a/src/smpi/colls/allgather/allgather-2dmesh.cpp +++ b/src/smpi/colls/allgather/allgather-2dmesh.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgather/allgather-3dmesh.cpp b/src/smpi/colls/allgather/allgather-3dmesh.cpp index 58927c9dbb..118dc79b87 100644 --- a/src/smpi/colls/allgather/allgather-3dmesh.cpp +++ b/src/smpi/colls/allgather/allgather-3dmesh.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgather/allgather-GB.cpp b/src/smpi/colls/allgather/allgather-GB.cpp index e87cae55cc..1303878f91 100644 --- a/src/smpi/colls/allgather/allgather-GB.cpp +++ b/src/smpi/colls/allgather/allgather-GB.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp index c4785d2c1b..bf07ba83e0 100644 --- a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp +++ b/src/smpi/colls/allgather/allgather-NTSLR-NB.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-NTSLR.cpp b/src/smpi/colls/allgather/allgather-NTSLR.cpp index a4a4b5e226..df49aadb20 100644 --- a/src/smpi/colls/allgather/allgather-NTSLR.cpp +++ b/src/smpi/colls/allgather/allgather-NTSLR.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-SMP-NTS.cpp b/src/smpi/colls/allgather/allgather-SMP-NTS.cpp index 91eb582fae..bf24b81a1f 100644 --- a/src/smpi/colls/allgather/allgather-SMP-NTS.cpp +++ b/src/smpi/colls/allgather/allgather-SMP-NTS.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-bruck.cpp b/src/smpi/colls/allgather/allgather-bruck.cpp index f9b53fe4cb..af61164288 100644 --- a/src/smpi/colls/allgather/allgather-bruck.cpp +++ b/src/smpi/colls/allgather/allgather-bruck.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgather/allgather-loosely-lr.cpp b/src/smpi/colls/allgather/allgather-loosely-lr.cpp index ddb11c298d..1994579c70 100644 --- a/src/smpi/colls/allgather/allgather-loosely-lr.cpp +++ b/src/smpi/colls/allgather/allgather-loosely-lr.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-mvapich-smp.cpp b/src/smpi/colls/allgather/allgather-mvapich-smp.cpp index e30e455f18..60efc284ed 100644 --- a/src/smpi/colls/allgather/allgather-mvapich-smp.cpp +++ b/src/smpi/colls/allgather/allgather-mvapich-smp.cpp @@ -34,7 +34,7 @@ * (C) 2001 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ - #include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp index 4f2707e700..08705f94f1 100644 --- a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp +++ b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp @@ -62,7 +62,7 @@ * [5] [5] [5] [5] [5] [5] */ - #include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-pair.cpp b/src/smpi/colls/allgather/allgather-pair.cpp index 932d8262e8..d5151281dd 100644 --- a/src/smpi/colls/allgather/allgather-pair.cpp +++ b/src/smpi/colls/allgather/allgather-pair.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgather/allgather-rdb.cpp b/src/smpi/colls/allgather/allgather-rdb.cpp index 5e1d47b398..d932ee11a3 100644 --- a/src/smpi/colls/allgather/allgather-rdb.cpp +++ b/src/smpi/colls/allgather/allgather-rdb.cpp @@ -3,7 +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 "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" namespace simgrid{ diff --git a/src/smpi/colls/allgather/allgather-rhv.cpp b/src/smpi/colls/allgather/allgather-rhv.cpp index 1c50923087..11d2a4413c 100644 --- a/src/smpi/colls/allgather/allgather-rhv.cpp +++ b/src/smpi/colls/allgather/allgather-rhv.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-ring.cpp b/src/smpi/colls/allgather/allgather-ring.cpp index 66903fab3b..d3af9e6918 100644 --- a/src/smpi/colls/allgather/allgather-ring.cpp +++ b/src/smpi/colls/allgather/allgather-ring.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgather/allgather-smp-simple.cpp b/src/smpi/colls/allgather/allgather-smp-simple.cpp index 42dad102d3..3d666a7a76 100644 --- a/src/smpi/colls/allgather/allgather-smp-simple.cpp +++ b/src/smpi/colls/allgather/allgather-smp-simple.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgather/allgather-spreading-simple.cpp b/src/smpi/colls/allgather/allgather-spreading-simple.cpp index df47969e70..9ad92aae59 100644 --- a/src/smpi/colls/allgather/allgather-spreading-simple.cpp +++ b/src/smpi/colls/allgather/allgather-spreading-simple.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgatherv/allgatherv-GB.cpp b/src/smpi/colls/allgatherv/allgatherv-GB.cpp index 2701c23595..09636066fe 100644 --- a/src/smpi/colls/allgatherv/allgatherv-GB.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-GB.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp index 9226be163e..c094c7d9a3 100644 --- a/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp @@ -6,7 +6,7 @@ /* Short or medium size message and power-of-two no. of processes. Use * recursive doubling algorithm */ -#include "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" namespace simgrid{ diff --git a/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp b/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp index e2e973ab71..18608b8c94 100644 --- a/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp @@ -10,7 +10,7 @@ * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: allgather_mpich_ring diff --git a/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp index 8ae33f0983..2c170ed603 100644 --- a/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp @@ -20,7 +20,7 @@ * Additional copyrights may follow */ -#include "../colls_private.h" +#include "../colls_private.hpp" /* * ompi_coll_tuned_allgatherv_intra_bruck * diff --git a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp index e88c1882d0..6fd6ee34ee 100644 --- a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp @@ -63,7 +63,7 @@ * [5] [5] [5] [5] [5] [5] */ - #include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgatherv/allgatherv-pair.cpp b/src/smpi/colls/allgatherv/allgatherv-pair.cpp index 9f1c95e648..37bf8592de 100644 --- a/src/smpi/colls/allgatherv/allgatherv-pair.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-pair.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allgatherv/allgatherv-ring.cpp b/src/smpi/colls/allgatherv/allgatherv-ring.cpp index 8f4e17e397..fc63b11f47 100644 --- a/src/smpi/colls/allgatherv/allgatherv-ring.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-ring.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/allreduce/allreduce-lr.cpp b/src/smpi/colls/allreduce/allreduce-lr.cpp index c9e10abef4..871f1a66e8 100644 --- a/src/smpi/colls/allreduce/allreduce-lr.cpp +++ b/src/smpi/colls/allreduce/allreduce-lr.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 "../colls_private.h" +#include "../colls_private.hpp" /* IMPLEMENTED BY PITCH PATARASUK Non-topoloty-specific all-reduce operation designed bandwidth optimally diff --git a/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp index cc9e89b0ff..1711f3b432 100644 --- a/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp +++ b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp @@ -21,7 +21,7 @@ * */ -#include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_allreduce_mvapich2_rs::allreduce(void *sendbuf, diff --git a/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp index 730307b0c1..aaece0d99b 100644 --- a/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp +++ b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp @@ -35,7 +35,7 @@ * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" +#include "../colls_private.hpp" #define MPIR_Allreduce_pt2pt_rd_MV2 Coll_allreduce_rdb::allreduce #define MPIR_Allreduce_pt2pt_rs_MV2 Coll_allreduce_mvapich2_rs::allreduce diff --git a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp index 2736daf63e..ebccf62d17 100644 --- a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp +++ b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp @@ -153,7 +153,7 @@ EARLY_BLOCK_COUNT = EARLY_BLOCK_COUNT + 1; \ } \ -#include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp index 9cfbf1ad4d..ea216ccb20 100644 --- a/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp +++ b/src/smpi/colls/allreduce/allreduce-rab-rdb.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_allreduce_rab_rdb::allreduce(void *sbuff, void *rbuff, int count, diff --git a/src/smpi/colls/allreduce/allreduce-rab1.cpp b/src/smpi/colls/allreduce/allreduce-rab1.cpp index 8f26894bb8..31cd8d584d 100644 --- a/src/smpi/colls/allreduce/allreduce-rab1.cpp +++ b/src/smpi/colls/allreduce/allreduce-rab1.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 "../colls_private.h" +#include "../colls_private.hpp" //#include namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allreduce/allreduce-rab2.cpp b/src/smpi/colls/allreduce/allreduce-rab2.cpp index ca9603bb66..487854c724 100644 --- a/src/smpi/colls/allreduce/allreduce-rab2.cpp +++ b/src/smpi/colls/allreduce/allreduce-rab2.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 "../colls_private.h" +#include "../colls_private.hpp" //#include namespace simgrid{ diff --git a/src/smpi/colls/allreduce/allreduce-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rdb.cpp index 552698a0d8..e1f85a758b 100644 --- a/src/smpi/colls/allreduce/allreduce-rdb.cpp +++ b/src/smpi/colls/allreduce/allreduce-rdb.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 "../colls_private.h" +#include "../colls_private.hpp" //#include namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allreduce/allreduce-redbcast.cpp b/src/smpi/colls/allreduce/allreduce-redbcast.cpp index 9ed2084a73..6d72e76563 100644 --- a/src/smpi/colls/allreduce/allreduce-redbcast.cpp +++ b/src/smpi/colls/allreduce/allreduce-redbcast.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_allreduce_redbcast::allreduce(void *buf, void *buf2, int count, diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp index e372373093..b14baa5f41 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.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 "../colls_private.h" +#include "../colls_private.hpp" /* IMPLEMENTED BY PITCH PATARASUK Non-topoloty-specific (however, number of cores/node need to be changed) all-reduce operation designed for smp clusters diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp index ff4e5d0f37..52df999814 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-binomial.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 "../colls_private.h" +#include "../colls_private.hpp" /* IMPLEMENTED BY PITCH PATARASUK Non-topoloty-specific (however, number of cores/node need to be changed) all-reduce operation designed for smp clusters diff --git a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp index 52453c263d..5c96b6296a 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rdb.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 "../colls_private.h" +#include "../colls_private.hpp" /* IMPLEMENTED BY PITCH PATARASUK Non-topoloty-specific (however, number of cores/node need to be changed) all-reduce operation designed for smp clusters diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp index afc21e8ca1..72eba89448 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.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 "../colls_private.h" +#include "../colls_private.hpp" //#include /* diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp index c0915a00ba..275c7bd81c 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp @@ -7,7 +7,7 @@ /* * implemented by Pitch Patarasuk, 07/01/2007 */ -#include "../colls_private.h" +#include "../colls_private.hpp" //#include diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp index ea08353f8f..7176495459 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag.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 "../colls_private.h" +#include "../colls_private.hpp" /* This fucntion performs all-reduce operation as follow. diff --git a/src/smpi/colls/alltoall/alltoall-2dmesh.cpp b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp index e75003a81c..9a1def0b4a 100644 --- a/src/smpi/colls/alltoall/alltoall-2dmesh.cpp +++ b/src/smpi/colls/alltoall/alltoall-2dmesh.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 "../colls_private.h" +#include "../colls_private.hpp" #include /***************************************************************************** diff --git a/src/smpi/colls/alltoall/alltoall-3dmesh.cpp b/src/smpi/colls/alltoall/alltoall-3dmesh.cpp index 85baad3b65..e8c5347b6a 100644 --- a/src/smpi/colls/alltoall/alltoall-3dmesh.cpp +++ b/src/smpi/colls/alltoall/alltoall-3dmesh.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 "../colls_private.h" +#include "../colls_private.hpp" #include /***************************************************************************** diff --git a/src/smpi/colls/alltoall/alltoall-basic-linear.cpp b/src/smpi/colls/alltoall/alltoall-basic-linear.cpp index 9b1b1a2aad..01aba9cbec 100644 --- a/src/smpi/colls/alltoall/alltoall-basic-linear.cpp +++ b/src/smpi/colls/alltoall/alltoall-basic-linear.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 "../colls_private.h" +#include "../colls_private.hpp" /*Naive and simple basic alltoall implementation. */ diff --git a/src/smpi/colls/alltoall/alltoall-bruck.cpp b/src/smpi/colls/alltoall/alltoall-bruck.cpp index fe000c3357..f8e15a51ea 100644 --- a/src/smpi/colls/alltoall/alltoall-bruck.cpp +++ b/src/smpi/colls/alltoall/alltoall-bruck.cpp @@ -25,7 +25,7 @@ ****************************************************************************/ -#include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp b/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp index 674525263b..bb5edb4fab 100644 --- a/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp +++ b/src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp @@ -41,7 +41,7 @@ //correct on stampede #define MV2_ALLTOALL_THROTTLE_FACTOR 4 -#include "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_alltoall_mvapich2_scatter_dest::alltoall( diff --git a/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp index fff723c6b8..80c6c94b50 100644 --- a/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair_light_barrier diff --git a/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp index d9f0aed3b1..cbe69d8c0b 100644 --- a/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair_mpi_barrier diff --git a/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp index f87779ccf7..10dc6567f9 100644 --- a/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair diff --git a/src/smpi/colls/alltoall/alltoall-pair.cpp b/src/smpi/colls/alltoall/alltoall-pair.cpp index 2dd6e00c81..2519526516 100644 --- a/src/smpi/colls/alltoall/alltoall-pair.cpp +++ b/src/smpi/colls/alltoall/alltoall-pair.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 "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_win.hpp" /***************************************************************************** diff --git a/src/smpi/colls/alltoall/alltoall-rdb.cpp b/src/smpi/colls/alltoall/alltoall-rdb.cpp index 5067aa75ff..31e521f727 100644 --- a/src/smpi/colls/alltoall/alltoall-rdb.cpp +++ b/src/smpi/colls/alltoall/alltoall-rdb.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 "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" /***************************************************************************** diff --git a/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp index 4cc7ee6f77..48ac6b082c 100644 --- a/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring_light_barrier diff --git a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp index add58faa03..fd9287efa4 100644 --- a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring_mpi_barrier diff --git a/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp index 8ebeab337d..099c7efdb5 100644 --- a/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp +++ b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring diff --git a/src/smpi/colls/alltoall/alltoall-ring.cpp b/src/smpi/colls/alltoall/alltoall-ring.cpp index 5065e1df76..bd648e7060 100644 --- a/src/smpi/colls/alltoall/alltoall-ring.cpp +++ b/src/smpi/colls/alltoall/alltoall-ring.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring diff --git a/src/smpi/colls/alltoallv/alltoallv-bruck.cpp b/src/smpi/colls/alltoallv/alltoallv-bruck.cpp index 41b4abde39..fd69acefd1 100644 --- a/src/smpi/colls/alltoallv/alltoallv-bruck.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-bruck.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 "../colls_private.h" +#include "../colls_private.hpp" /** * Alltoall Bruck diff --git a/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp b/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp index 8c9bc2902a..cbfd6e05a3 100644 --- a/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.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 "../colls_private.h" +#include "../colls_private.hpp" /* * Linear functions are copied from the basic coll module. For * some small number of nodes and/or small data sizes they are just as diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp index 738e2a58ea..19ecc4cbec 100644 --- a/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair_light_barrier diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp index c440013aa5..98dac23fae 100644 --- a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair_mpi_barrier diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp index 6dec9cd5d4..eff63ca4ef 100644 --- a/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_pair diff --git a/src/smpi/colls/alltoallv/alltoallv-pair.cpp b/src/smpi/colls/alltoallv/alltoallv-pair.cpp index e706a7944e..36290d658b 100644 --- a/src/smpi/colls/alltoallv/alltoallv-pair.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-pair.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp index 501c236382..a68f4c8efc 100644 --- a/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring_light_barrier diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp index 38bf38c846..7e14f3f544 100644 --- a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring_mpi_barrier diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp index 2d3996fcf4..5f7025a873 100644 --- a/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring diff --git a/src/smpi/colls/alltoallv/alltoallv-ring.cpp b/src/smpi/colls/alltoallv/alltoallv-ring.cpp index ddc591b507..79dadaf8c1 100644 --- a/src/smpi/colls/alltoallv/alltoallv-ring.cpp +++ b/src/smpi/colls/alltoallv/alltoallv-ring.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** * Function: alltoall_ring diff --git a/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp index e5f743d890..611c3eb441 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.h" -#include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.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 12c3af3a2c..8676c45329 100644 --- a/src/smpi/colls/barrier/barrier-ompi.cpp +++ b/src/smpi/colls/barrier/barrier-ompi.cpp @@ -20,9 +20,8 @@ * Additional copyrights may follow */ -#include "../colls_private.h" -#include "../coll_tuned_topo.h" - +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" /* * Barrier is ment to be a synchronous operation, as some BTLs can mark diff --git a/src/smpi/colls/bcast/bcast-NTSB.cpp b/src/smpi/colls/bcast/bcast-NTSB.cpp index 9e1e974fa6..3055371940 100644 --- a/src/smpi/colls/bcast/bcast-NTSB.cpp +++ b/src/smpi/colls/bcast/bcast-NTSB.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 "../colls_private.h" +#include "../colls_private.hpp" int bcast_NTSB_segment_size_in_byte = 8192; namespace simgrid{ diff --git a/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp b/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp index df3cf2b891..0a3c948bab 100644 --- a/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp +++ b/src/smpi/colls/bcast/bcast-NTSL-Isend.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 "../colls_private.h" +#include "../colls_private.hpp" static int bcast_NTSL_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/bcast/bcast-NTSL.cpp b/src/smpi/colls/bcast/bcast-NTSL.cpp index a9d3b83f50..957c80cf3b 100644 --- a/src/smpi/colls/bcast/bcast-NTSL.cpp +++ b/src/smpi/colls/bcast/bcast-NTSL.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 "../colls_private.h" +#include "../colls_private.hpp" static int bcast_NTSL_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/bcast/bcast-SMP-binary.cpp b/src/smpi/colls/bcast/bcast-SMP-binary.cpp index f4eb6a216f..bcec2292a4 100644 --- a/src/smpi/colls/bcast/bcast-SMP-binary.cpp +++ b/src/smpi/colls/bcast/bcast-SMP-binary.cpp @@ -4,8 +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 "../colls_private.h" - +#include "../colls_private.hpp" int bcast_SMP_binary_segment_byte = 8192; namespace simgrid{ diff --git a/src/smpi/colls/bcast/bcast-SMP-binomial.cpp b/src/smpi/colls/bcast/bcast-SMP-binomial.cpp index 3d6eb0bca8..dab6961627 100644 --- a/src/smpi/colls/bcast/bcast-SMP-binomial.cpp +++ b/src/smpi/colls/bcast/bcast-SMP-binomial.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int Coll_bcast_SMP_binomial::bcast(void *buf, int count, diff --git a/src/smpi/colls/bcast/bcast-SMP-linear.cpp b/src/smpi/colls/bcast/bcast-SMP-linear.cpp index 691706ecce..a63e9058a4 100644 --- a/src/smpi/colls/bcast/bcast-SMP-linear.cpp +++ b/src/smpi/colls/bcast/bcast-SMP-linear.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 "../colls_private.h" +#include "../colls_private.hpp" int bcast_SMP_linear_segment_byte = 8192; namespace simgrid{ diff --git a/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp index 3256363a12..21a549a523 100644 --- a/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp +++ b/src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.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 "../colls_private.h" +#include "../colls_private.hpp" int bcast_arrival_pattern_aware_wait_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp b/src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp index 102be48d22..484ba793fa 100644 --- a/src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp +++ b/src/smpi/colls/bcast/bcast-arrival-pattern-aware.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 "../colls_private.h" +#include "../colls_private.hpp" static int bcast_NTSL_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp index 3ecba94976..c74408803c 100644 --- a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp +++ b/src/smpi/colls/bcast/bcast-arrival-scatter.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 "../colls_private.h" +#include "../colls_private.hpp" #ifndef BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE #define BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE 128 diff --git a/src/smpi/colls/bcast/bcast-binomial-tree.cpp b/src/smpi/colls/bcast/bcast-binomial-tree.cpp index b8bc0e0e6c..027b4b9681 100644 --- a/src/smpi/colls/bcast/bcast-binomial-tree.cpp +++ b/src/smpi/colls/bcast/bcast-binomial-tree.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 "../colls_private.h" +#include "../colls_private.hpp" /***************************************************************************** diff --git a/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp b/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp index f03eb3aaae..db597a5b67 100644 --- a/src/smpi/colls/bcast/bcast-flattree-pipeline.cpp +++ b/src/smpi/colls/bcast/bcast-flattree-pipeline.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 "../colls_private.h" +#include "../colls_private.hpp" int flattree_segment_in_byte = 8192; namespace simgrid{ diff --git a/src/smpi/colls/bcast/bcast-flattree.cpp b/src/smpi/colls/bcast/bcast-flattree.cpp index f89bd94f34..79e9fe70f9 100644 --- a/src/smpi/colls/bcast/bcast-flattree.cpp +++ b/src/smpi/colls/bcast/bcast-flattree.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 "../colls_private.h" +#include "../colls_private.hpp" namespace simgrid{ namespace smpi{ int diff --git a/src/smpi/colls/bcast/bcast-mvapich-smp.cpp b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp index b0c0f31a8c..17e9ca041d 100644 --- a/src/smpi/colls/bcast/bcast-mvapich-smp.cpp +++ b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp @@ -34,8 +34,8 @@ * (C) 2001 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" +#include "../colls_private.hpp" extern int (*MV2_Bcast_function) (void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm_ptr); diff --git a/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp b/src/smpi/colls/bcast/bcast-ompi-pipeline.cpp index 425fcab111..bd5e475180 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.h" - #include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.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 52ad605112..1d227ba40b 100644 --- a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp +++ b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp @@ -55,9 +55,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "../colls_private.h" - #include "../coll_tuned_topo.h" - #define MAXTREEFANOUT 32 +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" +#define MAXTREEFANOUT 32 namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp index 6b304ade5f..6b7936d32b 100644 --- a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp @@ -3,7 +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 "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" /***************************************************************************** diff --git a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp index f48e31a536..df78b16451 100644 --- a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp @@ -3,7 +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 "../colls_private.h" +#include "../colls_private.hpp" #include "smpi_status.hpp" namespace simgrid{ diff --git a/src/smpi/colls/coll_tuned_topo.cpp b/src/smpi/colls/coll_tuned_topo.cpp index db88a997bb..c16628e2f3 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.h" -#include "coll_tuned_topo.h" +#include "colls_private.hpp" +#include "coll_tuned_topo.hpp" /* * Some static helpers. */ diff --git a/src/smpi/colls/coll_tuned_topo.h b/src/smpi/colls/coll_tuned_topo.hpp similarity index 99% rename from src/smpi/colls/coll_tuned_topo.h rename to src/smpi/colls/coll_tuned_topo.hpp index 907fdecf70..b4b008a2df 100644 --- a/src/smpi/colls/coll_tuned_topo.h +++ b/src/smpi/colls/coll_tuned_topo.hpp @@ -21,7 +21,7 @@ #ifndef MCA_COLL_TUNED_TOPO_H_HAS_BEEN_INCLUDED #define MCA_COLL_TUNED_TOPO_H_HAS_BEEN_INCLUDED -#include "colls_private.h" +#include "colls_private.hpp" #define MAXTREEFANOUT 32 diff --git a/src/smpi/colls/colls_private.h b/src/smpi/colls/colls_private.hpp similarity index 88% rename from src/smpi/colls/colls_private.h rename to src/smpi/colls/colls_private.hpp index fc28459fbd..e27ec91fdc 100644 --- a/src/smpi/colls/colls_private.h +++ b/src/smpi/colls/colls_private.hpp @@ -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. */ -#ifndef SMPI_COLLS_PRIVATE_H -#define SMPI_COLLS_PRIVATE_H +#ifndef SMPI_COLLS_PRIVATE_HPP +#define SMPI_COLLS_PRIVATE_HPP #include #include "smpi/mpi.h" diff --git a/src/smpi/colls/gather/gather-mvapich.cpp b/src/smpi/colls/gather/gather-mvapich.cpp index 9cc9a36259..79b703569f 100644 --- a/src/smpi/colls/gather/gather-mvapich.cpp +++ b/src/smpi/colls/gather/gather-mvapich.cpp @@ -35,11 +35,7 @@ * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" - - - - +#include "../colls_private.hpp" #define MPIR_Gather_MV2_Direct Coll_gather_ompi_basic_linear::gather #define MPIR_Gather_MV2_two_level_Direct Coll_gather_ompi_basic_linear::gather diff --git a/src/smpi/colls/gather/gather-ompi.cpp b/src/smpi/colls/gather/gather-ompi.cpp index 6190e56669..b3083b82b6 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.h" -#include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/reduce/reduce-NTSL.cpp b/src/smpi/colls/reduce/reduce-NTSL.cpp index b15c4f7056..b11c99d4f6 100644 --- a/src/smpi/colls/reduce/reduce-NTSL.cpp +++ b/src/smpi/colls/reduce/reduce-NTSL.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 "../colls_private.h" +#include "../colls_private.hpp" //#include int reduce_NTSL_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp index 91a371f256..a25a1c625f 100644 --- a/src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp +++ b/src/smpi/colls/reduce/reduce-arrival-pattern-aware.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 "../colls_private.h" +#include "../colls_private.hpp" //#include int reduce_arrival_pattern_aware_segment_size_in_byte = 8192; diff --git a/src/smpi/colls/reduce/reduce-binomial.cpp b/src/smpi/colls/reduce/reduce-binomial.cpp index 7321767499..d36c30f2f6 100644 --- a/src/smpi/colls/reduce/reduce-binomial.cpp +++ b/src/smpi/colls/reduce/reduce-binomial.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 "../colls_private.h" +#include "../colls_private.hpp" //#include namespace simgrid{ diff --git a/src/smpi/colls/reduce/reduce-flat-tree.cpp b/src/smpi/colls/reduce/reduce-flat-tree.cpp index c4c2e7fd21..225b456d12 100644 --- a/src/smpi/colls/reduce/reduce-flat-tree.cpp +++ b/src/smpi/colls/reduce/reduce-flat-tree.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 "../colls_private.h" +#include "../colls_private.hpp" //#include namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp index 2ab0774f80..d5788fb0bf 100644 --- a/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp +++ b/src/smpi/colls/reduce/reduce-mvapich-knomial.cpp @@ -38,7 +38,7 @@ * */ -#include "../colls_private.h" +#include "../colls_private.hpp" extern int mv2_reduce_intra_knomial_factor; extern int mv2_reduce_inter_knomial_factor; diff --git a/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp b/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp index 6d031e0363..3c3adc17a6 100644 --- a/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp +++ b/src/smpi/colls/reduce/reduce-mvapich-two-level.cpp @@ -35,7 +35,7 @@ * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" +#include "../colls_private.hpp" #define MV2_INTRA_SHMEM_REDUCE_MSG 2048 #define mv2_g_shmem_coll_max_msg_size (1 << 17) diff --git a/src/smpi/colls/reduce/reduce-ompi.cpp b/src/smpi/colls/reduce/reduce-ompi.cpp index f5d593d1af..1e368465a6 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.h" -#include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/reduce/reduce-rab.cpp b/src/smpi/colls/reduce/reduce-rab.cpp index b2c90e06b0..394544c106 100644 --- a/src/smpi/colls/reduce/reduce-rab.cpp +++ b/src/smpi/colls/reduce/reduce-rab.cpp @@ -9,7 +9,7 @@ * but this header must not be removed. */ -#include "../colls_private.h" +#include "../colls_private.hpp" #include #include diff --git a/src/smpi/colls/reduce/reduce-scatter-gather.cpp b/src/smpi/colls/reduce/reduce-scatter-gather.cpp index 4b987aa2f9..fc55a39c80 100644 --- a/src/smpi/colls/reduce/reduce-scatter-gather.cpp +++ b/src/smpi/colls/reduce/reduce-scatter-gather.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 "../colls_private.h" +#include "../colls_private.hpp" /* reduce diff --git a/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp index 39128a2e9f..995f078dc3 100644 --- a/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp +++ b/src/smpi/colls/reduce_scatter/reduce_scatter-mpich.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 "../colls_private.h" +#include "../colls_private.hpp" static inline int MPIU_Mirror_permutation(unsigned int x, int bits) { diff --git a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp index 8a28d8854a..3b9dfd8354 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.h" -#include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" /* * Recursive-halving function is (*mostly*) copied from the BASIC coll module. diff --git a/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp b/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp index cd701f5f58..16f3781b78 100644 --- a/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp +++ b/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp @@ -34,7 +34,7 @@ * (C) 2001 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ -#include "../colls_private.h" +#include "../colls_private.hpp" #define MPIR_Scatter_MV2_Binomial Coll_scatter_ompi_binomial::scatter #define MPIR_Scatter_MV2_Direct Coll_scatter_ompi_basic_linear::scatter diff --git a/src/smpi/colls/scatter/scatter-ompi.cpp b/src/smpi/colls/scatter/scatter-ompi.cpp index 5a2da7fa8f..01827008d5 100644 --- a/src/smpi/colls/scatter/scatter-ompi.cpp +++ b/src/smpi/colls/scatter/scatter-ompi.cpp @@ -19,9 +19,8 @@ * Additional copyrights may follow */ - -#include "../colls_private.h" -#include "../coll_tuned_topo.h" +#include "../colls_private.hpp" +#include "../coll_tuned_topo.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index b6b3693767..7b75b79256 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -8,7 +8,7 @@ #include -#include "colls_private.h" +#include "colls_private.hpp" #include "smpi_process.hpp" diff --git a/src/smpi/colls/smpi_default_selector.cpp b/src/smpi/colls/smpi_default_selector.cpp index f218a4efcb..f48c4bfe80 100644 --- a/src/smpi/colls/smpi_default_selector.cpp +++ b/src/smpi/colls/smpi_default_selector.cpp @@ -6,7 +6,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 "colls_private.h" +#include "colls_private.hpp" #include "smpi_process.hpp" namespace simgrid{ diff --git a/src/smpi/colls/smpi_intel_mpi_selector.cpp b/src/smpi/colls/smpi_intel_mpi_selector.cpp index 6bec031ed8..53bf9cdc3e 100644 --- a/src/smpi/colls/smpi_intel_mpi_selector.cpp +++ b/src/smpi/colls/smpi_intel_mpi_selector.cpp @@ -6,7 +6,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 "colls_private.h" +#include "colls_private.hpp" // This selector is based on information gathered on the Stampede cluster, with Intel MPI 4.1.3.049, and from the intel reference manual. The data was gathered launching runs with 1,2,4,8,16 processes per node. diff --git a/src/smpi/colls/smpi_mpich_selector.cpp b/src/smpi/colls/smpi_mpich_selector.cpp index b5a0858c6e..758a9e43ff 100644 --- a/src/smpi/colls/smpi_mpich_selector.cpp +++ b/src/smpi/colls/smpi_mpich_selector.cpp @@ -6,7 +6,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 "colls_private.h" +#include "colls_private.hpp" /* This is the default implementation of allreduce. The algorithm is: diff --git a/src/smpi/colls/smpi_mvapich2_selector.cpp b/src/smpi/colls/smpi_mvapich2_selector.cpp index 1d6978c3a1..01fb26857e 100644 --- a/src/smpi/colls/smpi_mvapich2_selector.cpp +++ b/src/smpi/colls/smpi_mvapich2_selector.cpp @@ -6,9 +6,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 "colls_private.h" +#include "colls_private.hpp" -#include "smpi_mvapich2_selector_stampede.h" +#include "smpi_mvapich2_selector_stampede.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/smpi_mvapich2_selector_stampede.h b/src/smpi/colls/smpi_mvapich2_selector_stampede.hpp similarity index 100% rename from src/smpi/colls/smpi_mvapich2_selector_stampede.h rename to src/smpi/colls/smpi_mvapich2_selector_stampede.hpp diff --git a/src/smpi/colls/smpi_openmpi_selector.cpp b/src/smpi/colls/smpi_openmpi_selector.cpp index 9770eb0b88..ead3440c83 100644 --- a/src/smpi/colls/smpi_openmpi_selector.cpp +++ b/src/smpi/colls/smpi_openmpi_selector.cpp @@ -6,7 +6,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 "colls_private.h" +#include "colls_private.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 46825403f9..cd10106855 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -6,7 +6,7 @@ #ifndef SMPI_PRIVATE_HPP #define SMPI_PRIVATE_HPP -#include "src/instr/instr_smpi.h" +#include "src/instr/instr_smpi.hpp" #include #include #include "src/internal_config.h" diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp index f532ec7522..04bb58186f 100644 --- a/src/smpi/include/smpi_process.hpp +++ b/src/smpi/include/smpi_process.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_PROCESS_HPP #define SMPI_PROCESS_HPP -#include "src/instr/instr_smpi.h" +#include "src/instr/instr_smpi.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "xbt/synchro.h" diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 866f17f3e0..01264d33fc 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -6,8 +6,8 @@ #include "mc/mc.h" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" +#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" diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 742af85a32..056228e5f9 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -5,15 +5,14 @@ #include "mc/mc.h" #include "src/mc/mc_replay.h" -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" +#include "src/msg/msg_private.hpp" +#include "src/simix/smx_private.hpp" #include "private.h" #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)"); //TODO : replace diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index e70e2052c5..c369b05b4d 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -13,7 +13,7 @@ #include "smpi_request.hpp" #include "smpi_status.hpp" #include "smpi_win.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include #include #include diff --git a/src/smpi/mpi/smpi_status.cpp b/src/smpi/mpi/smpi_status.cpp index 575046580d..6d637c521c 100644 --- a/src/smpi/mpi/smpi_status.cpp +++ b/src/smpi/mpi/smpi_status.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "smpi_datatype.hpp" #include "smpi_status.hpp" diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp index 122bfde350..a4ddf1b116 100644 --- a/src/surf/StorageImpl.cpp +++ b/src/surf/StorageImpl.cpp @@ -6,7 +6,7 @@ #include "StorageImpl.hpp" -#include "surf_private.h" +#include "surf_private.hpp" #include #include #include diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 7a6dc74f85..16f095d9bf 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -6,7 +6,7 @@ #include #include "cpu_interface.hpp" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals 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/instr_routing.cpp b/src/surf/instr_routing.cpp index e5fe65c900..50f60c20e0 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -3,7 +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 "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" diff --git a/src/surf/instr_surf.cpp b/src/surf/instr_surf.cpp index 83f7e1e227..43c84ed091 100644 --- a/src/surf/instr_surf.cpp +++ b/src/surf/instr_surf.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. +/* Copyright (c) 2010, 2012-2017. The SimGrid Team. * All rights reserved. */ /* 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.h" +#include "src/instr/instr_private.hpp" #include "src/surf/surf_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf"); diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index 095d6e0dca..23ca2252d2 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -298,7 +298,7 @@ int lmm_constraint_sharing_policy(lmm_constraint_t cnst) } /* @brief Remove a constraint - * Currently this is dead code, but it is exposed in maxmin.h + * Currently this is dead code, but it is exposed in maxmin.hpp * Apparently, this call was designed assuming that constraint would no more have elements in it. * If not the case, assertion will fail, and you need to add calls e.g. to lmm_shrink before effectively removing it. */ diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp index 44fac8c50b..5c9093bd26 100644 --- a/src/surf/maxmin_private.hpp +++ b/src/surf/maxmin_private.hpp @@ -6,7 +6,7 @@ #ifndef SURF_MAXMIN_PRIVATE_H #define SURF_MAXMIN_PRIVATE_H -#include "surf/maxmin.h" +#include "surf/maxmin.hpp" #include "xbt/swag.h" #include "xbt/mallocator.h" #include "surf_interface.hpp" diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index d3e8809e05..e7b27ac6ee 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -9,7 +9,7 @@ #include "network_cm02.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.h" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index a9139b1bad..2c78ab65c6 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -10,10 +10,10 @@ #include "ns3/core-module.h" #include "ns3/node.h" -#include "ns3/ns3_simulator.h" +#include "ns3/ns3_simulator.hpp" #include "network_ns3.hpp" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index b30a7eb830..fdb5683513 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -9,7 +9,7 @@ #include "xbt/base.h" #include "network_interface.hpp" -#include "src/surf/ns3/ns3_interface.h" +#include "src/surf/ns3/ns3_interface.hpp" namespace simgrid { namespace surf { diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.hpp similarity index 95% rename from src/surf/ns3/ns3_interface.h rename to src/surf/ns3/ns3_interface.hpp index 9479f656f9..58ed7d1416 100644 --- a/src/surf/ns3/ns3_interface.h +++ b/src/surf/ns3/ns3_interface.hpp @@ -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. */ -#ifndef NS3_INTERFACE_H -#define NS3_INTERFACE_H +#ifndef NS3_INTERFACE_HPP +#define NS3_INTERFACE_HPP #include "simgrid/s4u/Host.hpp" diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp index 7ba6d97e80..329680848e 100644 --- a/src/surf/ns3/ns3_simulator.cpp +++ b/src/surf/ns3/ns3_simulator.cpp @@ -3,7 +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 "src/surf/ns3/ns3_simulator.h" +#include "src/surf/ns3/ns3_simulator.hpp" #include "xbt/dict.h" #include "xbt/log.h" #include "xbt/sysdep.h" diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.hpp similarity index 93% rename from src/surf/ns3/ns3_simulator.h rename to src/surf/ns3/ns3_simulator.hpp index c69c1a8d41..c007c2592d 100644 --- a/src/surf/ns3/ns3_simulator.h +++ b/src/surf/ns3/ns3_simulator.hpp @@ -3,12 +3,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. */ -#ifndef NS3_SIM_H -#define NS3_SIM_H +#ifndef NS3_SIMULATOR_HPP +#define NS3_SIMULATOR_HPP #include -#include "ns3_interface.h" +#include "ns3_interface.hpp" #include #include diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 354ba1c6c6..6d5651723f 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -7,7 +7,7 @@ #include "simgrid/s4u/Storage.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/include/simgrid/sg_config.h" diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 61e00b91fd..f2a1505049 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Engine.hpp" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index c07fe792db..76293aaa15 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -7,7 +7,7 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.h" -#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/HostImpl.hpp" diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 0e2b5cad2a..a481159120 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -8,7 +8,7 @@ #include "xbt/signal.hpp" -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" #include "surf/surf.h" #include "xbt/str.h" diff --git a/src/surf/surf_private.h b/src/surf/surf_private.hpp similarity index 95% rename from src/surf/surf_private.h rename to src/surf/surf_private.hpp index fc90b62a9a..3278c2f601 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.hpp @@ -3,11 +3,11 @@ /* 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. */ -#ifndef SURF_SURF_PRIVATE_H -#define SURF_SURF_PRIVATE_H +#ifndef SURF_SURF_PRIVATE_HPP +#define SURF_SURF_PRIVATE_HPP #include "surf/surf.h" -#include "surf/maxmin.h" +#include "surf/maxmin.hpp" #include "src/surf/trace_mgr.hpp" #define NO_MAX_DURATION -1.0 diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index dbbf1ae424..66e0d9e1c7 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -9,7 +9,7 @@ #include "src/surf/surf_interface.hpp" #include "src/surf/trace_mgr.hpp" -#include "surf_private.h" +#include "surf_private.hpp" #include "xbt/RngStream.h" #include #include diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index f3f0e08064..7b6e4c1875 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.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 "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals +#include "src/instr/instr_private.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" #include "xbt/log.h" @@ -15,7 +15,7 @@ #if SIMGRID_HAVE_LUA extern "C" { -#include "src/bindings/lua/simgrid_lua.h" +#include "src/bindings/lua/simgrid_lua.hpp" #include /* Always include this when calling Lua */ #include /* Always include this when calling Lua */ diff --git a/teshsuite/mc/dwarf-expression/dwarf-expression.cpp b/teshsuite/mc/dwarf-expression/dwarf-expression.cpp index 5cd9b4620f..b8e4bec4d7 100644 --- a/teshsuite/mc/dwarf-expression/dwarf-expression.cpp +++ b/teshsuite/mc/dwarf-expression/dwarf-expression.cpp @@ -12,7 +12,7 @@ #include #include -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Type.hpp" diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp index 02c26eac9c..16ad053fc8 100644 --- a/teshsuite/mc/dwarf/dwarf.cpp +++ b/teshsuite/mc/dwarf/dwarf.cpp @@ -14,7 +14,7 @@ #include #include "mc/datatypes.h" -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Type.hpp" diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp index c35f43779c..3a57290ef4 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp @@ -8,7 +8,7 @@ #include "simgrid/msg.h" #include "src/surf/surf_interface.hpp" -#include "surf/maxmin.h" +#include "surf/maxmin.hpp" #include "xbt/log.h" #include "xbt/module.h" #include "xbt/sysdep.h" diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp index 6bb1b1eea3..d3408b10fe 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -6,7 +6,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 "surf/maxmin.h" +#include "surf/maxmin.hpp" #include "simgrid/msg.h" #include "xbt/module.h" #include "xbt/sysdep.h" /* time manipulation for benchmarking */ diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index ba462e58bf..66fa5853f1 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -8,32 +8,32 @@ set(EXTRA_DIST src/include/simgrid/sg_config.h src/include/smpi/smpi_utils.hpp src/include/surf/datatypes.h - src/include/surf/maxmin.h + src/include/surf/maxmin.hpp src/include/surf/surf.h src/include/xbt/parmap.hpp - src/mc/mc_mmu.h - src/mc/mc_record.h + src/mc/mc_mmu.hpp + src/mc/mc_record.hpp src/mc/PageStore.hpp - src/msg/msg_private.h + src/msg/msg_private.hpp src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h src/simdag/simdag_private.hpp src/simix/simcalls.in src/simix/simcalls.py - src/simix/popping_private.h + src/simix/popping_private.hpp src/simix/popping_bodies.cpp src/simix/popping_generated.cpp src/simix/popping_enum.h - src/simix/popping_accessors.h - src/simix/smx_host_private.h - src/simix/smx_io_private.h - src/simix/smx_network_private.h - src/simix/smx_private.h + src/simix/popping_accessors.hpp + src/simix/smx_host_private.hpp + src/simix/smx_io_private.hpp + src/simix/smx_network_private.hpp + src/simix/smx_private.hpp src/simix/smx_synchro_private.hpp - src/smpi/colls/coll_tuned_topo.h - src/smpi/colls/colls_private.h - src/smpi/colls/smpi_mvapich2_selector_stampede.h + src/smpi/colls/coll_tuned_topo.hpp + src/smpi/colls/colls_private.hpp + src/smpi/colls/smpi_mvapich2_selector_stampede.hpp src/smpi/include/private.h src/smpi/include/private.hpp src/surf/cpu_cas01.hpp @@ -46,8 +46,8 @@ set(EXTRA_DIST src/surf/network_ns3.hpp src/surf/network_smpi.hpp src/surf/network_ib.hpp - src/surf/ns3/ns3_interface.h - src/surf/ns3/ns3_simulator.h + src/surf/ns3/ns3_interface.hpp + src/surf/ns3/ns3_simulator.hpp src/surf/trace_mgr_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h @@ -58,7 +58,7 @@ set(EXTRA_DIST src/surf/StorageImpl.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp - src/surf/surf_private.h + src/surf/surf_private.hpp src/surf/PropertyHolder.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp @@ -468,16 +468,16 @@ set(SIMDAG_SRC ) set(BINDINGS_SRC - src/bindings/lua/lua_private.h - src/bindings/lua/lua_utils.h - src/bindings/lua/simgrid_lua.h + src/bindings/lua/lua_private.hpp + src/bindings/lua/lua_utils.hpp + src/bindings/lua/simgrid_lua.hpp ) set(JMSG_C_SRC src/bindings/java/jmsg.cpp - src/bindings/java/jmsg.h + src/bindings/java/jmsg.hpp src/bindings/java/jmsg_as.cpp - src/bindings/java/jmsg_as.h + src/bindings/java/jmsg_as.hpp src/bindings/java/jmsg_comm.cpp src/bindings/java/jmsg_comm.h src/bindings/java/jmsg_file.cpp @@ -495,7 +495,7 @@ set(JMSG_C_SRC src/bindings/java/jmsg_vm.cpp src/bindings/java/jmsg_vm.h src/bindings/java/jxbt_utilities.cpp - src/bindings/java/jxbt_utilities.h + src/bindings/java/jxbt_utilities.hpp src/bindings/java/JavaContext.cpp src/bindings/java/JavaContext.hpp src/bindings/java/jmsg_storage.cpp @@ -553,8 +553,8 @@ set(TRACING_SRC src/instr/instr_paje_trace.cpp src/instr/instr_paje_types.cpp src/instr/instr_paje_values.cpp - src/instr/instr_private.h - src/instr/instr_smpi.h + src/instr/instr_private.hpp + src/instr/instr_smpi.hpp src/instr/instr_resource_utilization.cpp ) @@ -572,7 +572,7 @@ set(JEDULE_SRC set(MC_SRC_BASE src/mc/mc_base.cpp src/mc/mc_base.h - src/mc/mc_record.h + src/mc/mc_record.hpp src/mc/mc_replay.h src/mc/mc_record.cpp src/mc/mc_config.cpp @@ -616,11 +616,11 @@ set(MC_SRC src/mc/mc_forward.hpp src/mc/Session.cpp src/mc/Session.hpp - src/mc/mc_unw.h + src/mc/mc_unw.hpp src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp src/mc/mc_checkpoint.cpp - src/mc/mc_snapshot.h + src/mc/mc_snapshot.hpp src/mc/mc_snapshot.cpp src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.cpp @@ -640,20 +640,20 @@ set(MC_SRC src/mc/mc_record.cpp src/mc/mc_member.cpp src/mc/mc_memory.cpp - src/mc/mc_private.h - src/mc/mc_request.h + src/mc/mc_private.hpp + src/mc/mc_request.hpp src/mc/mc_request.cpp - src/mc/mc_safety.h - src/mc/mc_state.h + src/mc/mc_safety.hpp + src/mc/mc_state.hpp src/mc/mc_state.cpp src/mc/VisitedState.cpp src/mc/VisitedState.hpp src/mc/mc_client_api.cpp - src/mc/mc_smx.h + src/mc/mc_smx.hpp src/mc/mc_smx.cpp src/mc/mc_xbt.hpp src/mc/mc_xbt.cpp - src/mc/mc_exit.h + src/mc/mc_exit.hpp src/mc/Transition.hpp ) diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index eff28d86a2..78f17b67c7 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -16,7 +16,7 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h - ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h + ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp DEPENDS ${CMAKE_HOME_DIRECTORY}/src/simix/simcalls.py @@ -32,11 +32,11 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h - ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h + ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp ) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.h" + "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp" ) endif() endif() -- 2.20.1