X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..d243290d592d5291708a45ea34c1dfc8d232ef4b:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 510bb81c52..858fabc538 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,17 +2,17 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
-  src/include/instr/instr_interface.h
+  src/bindings/python/simgrid_python.cpp
   src/include/mc/datatypes.h
   src/include/mc/mc.h
-  src/include/simgrid/sg_config.h
-  src/include/surf/datatypes.h
-  src/include/surf/maxmin.hpp
+  src/include/simgrid/sg_config.hpp
   src/include/surf/surf.hpp
+  src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
+  src/include/xbt/mmalloc.h
+  src/include/catch.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
-  src/mc/PageStore.hpp
   src/msg/msg_private.hpp
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
@@ -25,29 +25,24 @@ set(EXTRA_DIST
   src/simix/popping_generated.cpp
   src/simix/popping_enum.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.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp
   src/smpi/include/smpi_utils.hpp
+  src/smpi/smpi_main.c
+  src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
-  src/surf/maxmin_private.hpp
   src/surf/network_cm02.hpp
   src/surf/network_constant.hpp
   src/surf/network_interface.hpp
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  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
   src/surf/xml/simgrid_dtd.c
@@ -66,11 +61,8 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
-  src/xbt/backtrace_dummy.cpp
-  src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
-  src/xbt/graph_private.h
-  src/xbt/log_private.h
+  src/xbt/log_private.hpp
   src/xbt/mallocator_private.h
 
   src/xbt/mmalloc/mfree.c
@@ -83,22 +75,24 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmorecore.c
   src/xbt/mmalloc/mmprivate.h
   src/xbt/mmalloc/mrealloc.c
+  src/xbt/mmalloc/swag.c
+  src/xbt/mmalloc/swag.h
   tools/tesh/generate_tesh
   tools/lualib.patch
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
-  
-  examples/java/.classpath
-  examples/java/.project
+
+  examples/deprecated/java/.classpath
+  examples/deprecated/java/.project
   )
 
 set(SMPI_SRC
-  src/smpi/smpi_main.c
   src/smpi/bindings/smpi_mpi.cpp
   src/smpi/bindings/smpi_pmpi.cpp
   src/smpi/bindings/smpi_pmpi_coll.cpp
   src/smpi/bindings/smpi_pmpi_comm.cpp
+  src/smpi/bindings/smpi_pmpi_file.cpp
   src/smpi/bindings/smpi_pmpi_group.cpp
   src/smpi/bindings/smpi_pmpi_info.cpp
   src/smpi/bindings/smpi_pmpi_op.cpp
@@ -175,6 +169,7 @@ set(SMPI_SRC
   src/smpi/colls/alltoallv/alltoallv-ring.cpp
   src/smpi/colls/barrier/barrier-ompi.cpp
   src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
+  src/smpi/colls/barrier/barrier-mpich-smp.cpp
   src/smpi/colls/bcast/bcast-NTSB.cpp
   src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
   src/smpi/colls/bcast/bcast-NTSL.cpp
@@ -209,6 +204,7 @@ set(SMPI_SRC
   src/smpi/colls/reduce/reduce-rab.cpp
   src/smpi/colls/scatter/scatter-ompi.cpp
   src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
+  src/smpi/colls/smpi_nbc_impl.cpp
   src/smpi/colls/smpi_automatic_selector.cpp
   src/smpi/colls/smpi_default_selector.cpp
   src/smpi/colls/smpi_mpich_selector.cpp
@@ -220,18 +216,18 @@ set(SMPI_SRC
   src/smpi/internals/smpi_bench.cpp
   src/smpi/internals/smpi_memory.cpp
   src/smpi/internals/smpi_shared.cpp
-  src/smpi/internals/smpi_static_variables.cpp
   src/smpi/internals/smpi_deployment.cpp
   src/smpi/internals/smpi_dvfs.cpp
   src/smpi/internals/smpi_global.cpp
-  src/smpi/internals/SmpiHost.cpp
+  src/smpi/internals/smpi_host.cpp
   src/smpi/internals/smpi_replay.cpp
-  src/smpi/internals/smpi_process.cpp
+  src/smpi/internals/smpi_actor.cpp
   src/smpi/internals/smpi_utils.cpp
   src/smpi/mpi/smpi_comm.cpp
   src/smpi/mpi/smpi_datatype.cpp
   src/smpi/mpi/smpi_datatype_derived.cpp
   src/smpi/mpi/smpi_f2c.cpp
+  src/smpi/mpi/smpi_file.cpp
   src/smpi/mpi/smpi_group.cpp
   src/smpi/mpi/smpi_info.cpp
   src/smpi/mpi/smpi_keyvals.cpp
@@ -240,21 +236,29 @@ set(SMPI_SRC
   src/smpi/mpi/smpi_status.cpp
   src/smpi/mpi/smpi_topo.cpp
   src/smpi/mpi/smpi_win.cpp
+  src/smpi/include/smpi_actor.hpp
   src/smpi/include/smpi_coll.hpp
   src/smpi/include/smpi_comm.hpp
+  src/smpi/include/smpi_datatype_derived.hpp
+  src/smpi/include/smpi_datatype.hpp
   src/smpi/include/smpi_f2c.hpp
+  src/smpi/include/smpi_file.hpp
   src/smpi/include/smpi_group.hpp
-  src/smpi/include/SmpiHost.hpp
-  src/smpi/include/smpi_datatype.hpp
+  src/smpi/include/smpi_host.hpp
   src/smpi/include/smpi_info.hpp
   src/smpi/include/smpi_keyvals.hpp
-  src/smpi/include/smpi_datatype_derived.hpp
   src/smpi/include/smpi_op.hpp
-  src/smpi/include/smpi_process.hpp
   src/smpi/include/smpi_request.hpp
   src/smpi/include/smpi_status.hpp
-  src/smpi/include/smpi_win.hpp
   src/smpi/include/smpi_topo.hpp
+  src/smpi/include/smpi_win.hpp
+  src/smpi/plugins/sampi_loadbalancer.cpp
+  src/smpi/plugins/ampi/ampi.cpp
+  src/smpi/plugins/ampi/ampi.hpp
+  src/smpi/plugins/ampi/instr_ampi.cpp
+  src/smpi/plugins/ampi/instr_ampi.hpp
+  src/smpi/plugins/load_balancer/LoadBalancer.cpp
+  src/smpi/plugins/load_balancer/load_balancer.hpp
   src/surf/network_smpi.cpp
   src/surf/network_ib.cpp
   )
@@ -265,25 +269,23 @@ set(XBT_SRC
   src/xbt/automaton/automatonparse_promela.c
   src/xbt/backtrace.cpp
   src/xbt/config.cpp
-  src/xbt/cunit.cpp
   src/xbt/dict.cpp
   src/xbt/dict_cursor.c
   src/xbt/dict_elm.c
   src/xbt/dynar.cpp
-  src/xbt/ex.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c
-  src/xbt/log.c
+  src/xbt/log.cpp
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
+  src/xbt/OsSemaphore.hpp
   src/xbt/parmap.cpp
   src/xbt/snprintf.c
   src/xbt/string.cpp
-  src/xbt/swag.c
-  src/xbt/xbt_log_appender_file.c
-  src/xbt/xbt_log_layout_format.c
-  src/xbt/xbt_log_layout_simple.c
+  src/xbt/xbt_log_appender_file.cpp
+  src/xbt/xbt_log_layout_format.cpp
+  src/xbt/xbt_log_layout_simple.cpp
   src/xbt/xbt_main.cpp
   src/xbt/xbt_os_file.cpp
   src/xbt/xbt_os_synchro.cpp
@@ -302,48 +304,45 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cpp )
 
 set(SURF_SRC
+  src/kernel/lmm/fair_bottleneck.cpp
+  src/kernel/lmm/maxmin.hpp
+  src/kernel/lmm/maxmin.cpp
+
+  src/kernel/resource/Action.cpp
+  src/kernel/resource/Model.cpp
+  src/kernel/resource/Resource.cpp
+
+  src/kernel/resource/profile/DatedValue.cpp
+  src/kernel/resource/profile/DatedValue.hpp
+  src/kernel/resource/profile/Event.hpp
+  src/kernel/resource/profile/FutureEvtSet.cpp
+  src/kernel/resource/profile/FutureEvtSet.hpp
+  src/kernel/resource/profile/Profile.cpp
+  src/kernel/resource/profile/Profile.hpp
+
   src/kernel/routing/ClusterZone.cpp
-  src/kernel/routing/ClusterZone.hpp
   src/kernel/routing/DijkstraZone.cpp
-  src/kernel/routing/DijkstraZone.hpp
   src/kernel/routing/DragonflyZone.cpp
-  src/kernel/routing/DragonflyZone.hpp
   src/kernel/routing/EmptyZone.cpp
-  src/kernel/routing/EmptyZone.hpp
   src/kernel/routing/FatTreeZone.cpp
-  src/kernel/routing/FatTreeZone.hpp
   src/kernel/routing/FloydZone.cpp
-  src/kernel/routing/FloydZone.hpp
   src/kernel/routing/FullZone.cpp
-  src/kernel/routing/FullZone.hpp
   src/kernel/routing/NetPoint.cpp
-  src/kernel/routing/NetPoint.hpp
   src/kernel/routing/NetZoneImpl.cpp
-  src/kernel/routing/NetZoneImpl.hpp
-  src/kernel/routing/RoutedZone.cpp
-  src/kernel/routing/RoutedZone.hpp
   src/kernel/routing/TorusZone.cpp
-  src/kernel/routing/TorusZone.hpp
+  src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp
-  src/kernel/routing/VivaldiZone.hpp  
-  
+
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
 
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
-  src/surf/fair_bottleneck.cpp
-  src/surf/instr_routing.cpp
-  src/surf/instr_surf.cpp
-  src/surf/lagrange.cpp
-  src/surf/maxmin.cpp
   src/surf/network_cm02.cpp
+  src/surf/link_wifi.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
-  src/surf/plugins/host_energy.cpp
-  src/surf/plugins/link_energy.cpp
-  src/surf/plugins/host_load.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp
   src/surf/StorageImpl.cpp
@@ -354,55 +353,68 @@ set(SURF_SRC
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
   src/surf/xml/surfxml_parseplatf.cpp
-  src/surf/trace_mgr.hpp
-  src/surf/trace_mgr.cpp
   src/surf/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
 
 set(PLUGINS_SRC
+  src/plugins/dirty_page_tracking.cpp
+  src/plugins/host_dvfs.cpp
+  src/plugins/host_energy.cpp
+  src/plugins/link_energy.cpp
+  src/plugins/host_load.cpp
+  src/plugins/file_system/s4u_FileSystem.cpp
+  src/plugins/vm/VirtualMachineImpl.hpp
   src/plugins/vm/s4u_VirtualMachine.cpp
   src/plugins/vm/VirtualMachineImpl.hpp
   src/plugins/vm/VirtualMachineImpl.cpp
   src/plugins/vm/VmHostExt.hpp
   src/plugins/vm/VmHostExt.cpp
+  src/plugins/vm/VmLiveMigration.cpp
+  src/plugins/vm/VmLiveMigration.hpp
   )
-  
+
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
+  src/kernel/context/context_private.hpp
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
   src/kernel/context/ContextRaw.hpp
+  src/kernel/context/ContextSwapped.cpp
+  src/kernel/context/ContextSwapped.hpp
+  src/kernel/context/ContextThread.cpp
+  src/kernel/context/ContextThread.hpp
   src/simix/smx_deployment.cpp
-  src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
-  src/simix/smx_host.cpp
-  src/simix/smx_io.cpp
-  src/simix/smx_network.cpp
-  src/simix/ActorImpl.cpp
-  src/simix/ActorImpl.hpp
-  src/simix/smx_synchro.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/ConditionVariableImpl.cpp
+  src/kernel/activity/ConditionVariableImpl.hpp
   src/kernel/activity/CommImpl.cpp
   src/kernel/activity/CommImpl.hpp
   src/kernel/activity/ExecImpl.cpp
   src/kernel/activity/ExecImpl.hpp
+  src/kernel/activity/IoImpl.cpp
+  src/kernel/activity/IoImpl.hpp
   src/kernel/activity/MailboxImpl.cpp
   src/kernel/activity/MailboxImpl.hpp
+  src/kernel/activity/MutexImpl.cpp
+  src/kernel/activity/MutexImpl.hpp
+  src/kernel/activity/SemaphoreImpl.cpp
+  src/kernel/activity/SemaphoreImpl.hpp
   src/kernel/activity/SleepImpl.cpp
   src/kernel/activity/SleepImpl.hpp
-  src/kernel/activity/SynchroIo.cpp
-  src/kernel/activity/SynchroIo.hpp
   src/kernel/activity/SynchroRaw.cpp
   src/kernel/activity/SynchroRaw.hpp
-  
+  src/kernel/actor/ActorImpl.cpp
+  src/kernel/actor/ActorImpl.hpp
+
   ${SIMIX_GENERATED_SRC}
   )
 
@@ -420,41 +432,35 @@ else()
 endif()
 
 set(S4U_SRC
-  src/s4u/s4u_actor.cpp
-  src/s4u/s4u_activity.cpp
-  src/s4u/s4u_conditionVariable.cpp
-  src/s4u/s4u_comm.cpp
-  src/s4u/s4u_engine.cpp  
-  src/s4u/s4u_file.cpp  
-  src/s4u/s4u_host.cpp  
-  src/s4u/s4u_link.cpp
-  src/s4u/s4u_mailbox.cpp
-  src/s4u/s4u_mutex.cpp
-  src/s4u/s4u_netzone.cpp
-  src/s4u/s4u_storage.cpp
+  src/s4u/s4u_Actor.cpp
+  src/s4u/s4u_Activity.cpp
+  src/s4u/s4u_Barrier.cpp
+  src/s4u/s4u_ConditionVariable.cpp
+  src/s4u/s4u_Comm.cpp
+  src/s4u/s4u_Engine.cpp
+  src/s4u/s4u_Exec.cpp
+  src/s4u/s4u_Host.cpp
+  src/s4u/s4u_Io.cpp
+  src/s4u/s4u_Link.cpp
+  src/s4u/s4u_Mailbox.cpp
+  src/s4u/s4u_Mutex.cpp
+  src/s4u/s4u_Netzone.cpp
+  src/s4u/s4u_Semaphore.cpp
+  src/s4u/s4u_Storage.cpp
 )
 
 set(SIMGRID_SRC
+  src/simgrid/Exception.cpp
   src/simgrid/sg_config.cpp
-  src/simgrid/host.cpp
   src/simgrid/util.hpp
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.cpp
-  src/msg/instr_msg_task.cpp
-  src/msg/msg_actions.cpp
-  src/msg/msg_deployment.cpp
-  src/msg/msg_environment.cpp
   src/msg/msg_global.cpp
-  src/msg/msg_gos.cpp
-  src/msg/msg_host.cpp
-  src/msg/msg_io.cpp
-  src/msg/msg_mailbox.cpp
+  src/msg/msg_comm.cpp
+  src/msg/msg_legacy.cpp
   src/msg/msg_process.cpp
-  src/msg/msg_synchro.cpp
   src/msg/msg_task.cpp
-  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC
@@ -538,7 +544,7 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 set(LUA_SRC
   src/bindings/lua/lua_host.cpp
   src/bindings/lua/lua_platf.cpp
-  src/bindings/lua/lua_debug.cpp
+  src/bindings/lua/lua_utils.cpp
   src/bindings/lua/simgrid_lua.cpp
   )
 
@@ -555,6 +561,7 @@ set(TRACING_SRC
   src/instr/instr_paje_types.hpp
   src/instr/instr_paje_values.cpp
   src/instr/instr_paje_values.hpp
+  src/instr/instr_platform.cpp
   src/instr/instr_private.hpp
   src/instr/instr_smpi.hpp
   src/instr/instr_resource_utilization.cpp
@@ -578,6 +585,7 @@ set(MC_SRC_BASE
   src/mc/mc_replay.hpp
   src/mc/mc_record.cpp
   src/mc/mc_config.cpp
+  src/mc/mc_config.hpp
   src/mc/mc_global.cpp
   )
 
@@ -590,6 +598,26 @@ set(MC_SRC
   src/mc/checker/SafetyChecker.hpp
   src/mc/checker/LivenessChecker.cpp
   src/mc/checker/LivenessChecker.hpp
+  
+  src/mc/inspect/DwarfExpression.hpp
+  src/mc/inspect/DwarfExpression.cpp
+  src/mc/inspect/Frame.hpp
+  src/mc/inspect/Frame.cpp
+  src/mc/inspect/LocationList.hpp
+  src/mc/inspect/LocationList.cpp
+  src/mc/inspect/ObjectInformation.hpp
+  src/mc/inspect/ObjectInformation.cpp
+  src/mc/inspect/Type.hpp
+  src/mc/inspect/Variable.hpp
+  src/mc/inspect/mc_dwarf.hpp
+  src/mc/inspect/mc_dwarf.cpp
+  src/mc/inspect/mc_dwarf_attrnames.cpp
+  src/mc/inspect/mc_dwarf_tagnames.cpp
+  src/mc/inspect/mc_member.cpp
+  src/mc/inspect/mc_unw.hpp
+  src/mc/inspect/mc_unw.cpp
+  src/mc/inspect/mc_unw_vmread.cpp
+
   src/mc/remote/Channel.cpp
   src/mc/remote/Channel.hpp
   src/mc/remote/Client.cpp
@@ -599,48 +627,29 @@ set(MC_SRC
   src/mc/remote/RemotePtr.hpp
   src/mc/remote/mc_protocol.h
   src/mc/remote/mc_protocol.cpp
+
+  src/mc/sosp/PageStore.hpp
+  src/mc/sosp/PageStore.cpp
+  src/mc/sosp/ChunkedData.hpp
+  src/mc/sosp/ChunkedData.cpp
+  src/mc/sosp/Region.cpp
+  src/mc/sosp/Region.hpp
+  src/mc/sosp/Snapshot.hpp
+  src/mc/sosp/Snapshot.cpp
   
   src/mc/AddressSpace.hpp
-  src/mc/Frame.hpp
-  src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
   src/mc/ModelChecker.cpp
-  src/mc/ObjectInformation.hpp
-  src/mc/ObjectInformation.cpp
-  src/mc/PageStore.hpp
-  src/mc/PageStore.cpp
-  src/mc/ChunkedData.hpp
-  src/mc/ChunkedData.cpp
-  src/mc/RegionSnapshot.cpp
-  src/mc/RegionSnapshot.hpp
-  src/mc/Type.hpp
-  src/mc/Variable.hpp
   src/mc/mc_forward.hpp
   src/mc/Session.cpp
   src/mc/Session.hpp
-  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.hpp
-  src/mc/mc_snapshot.cpp
-  src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.cpp
   src/mc/mc_comm_pattern.hpp
   src/mc/compare.cpp
-  src/mc/mc_dwarf.hpp
-  src/mc/mc_dwarf.cpp
-  src/mc/mc_dwarf_attrnames.cpp
-  src/mc/DwarfExpression.hpp
-  src/mc/DwarfExpression.cpp
-  src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
-  src/mc/mc_ignore.h
-  src/mc/LocationList.hpp
-  src/mc/LocationList.cpp
+  src/mc/mc_ignore.hpp
   src/mc/mc_record.cpp
-  src/mc/mc_member.cpp
   src/mc/mc_memory.cpp
   src/mc/mc_private.hpp
   src/mc/mc_request.hpp
@@ -653,8 +662,6 @@ set(MC_SRC
   src/mc/mc_client_api.cpp
   src/mc/mc_smx.hpp
   src/mc/mc_smx.cpp
-  src/mc/mc_xbt.hpp
-  src/mc/mc_xbt.cpp
   src/mc/mc_exit.hpp
   src/mc/Transition.hpp
   )
@@ -662,13 +669,23 @@ set(MC_SRC
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
+  include/simgrid_config.h
+  include/simgrid/actor.h
+  include/simgrid/barrier.h
+  include/simgrid/engine.h
+  include/simgrid/Exception.hpp
   include/simgrid/chrono.hpp
+  include/simgrid/plugins/dvfs.h
   include/simgrid/plugins/energy.h
+  include/simgrid/plugins/file_system.h
+  include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
+  include/simgrid/plugins/load_balancer.h
+  include/simgrid/smpi/replay.hpp
   include/simgrid/instr.h
+  include/simgrid/mailbox.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
-  include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
   include/simgrid/simix.h
@@ -677,46 +694,65 @@ set(headers_to_install
   include/simgrid/kernel/future.hpp
   include/simgrid/host.h
   include/simgrid/link.h
-  include/simgrid/s4u/forward.hpp
+  include/simgrid/semaphore.h
+  include/simgrid/storage.h
+  include/simgrid/vm.h
+  include/simgrid/zone.h
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
+  include/simgrid/s4u/Barrier.hpp
   include/simgrid/s4u/Comm.hpp
   include/simgrid/s4u/ConditionVariable.hpp
-  include/simgrid/s4u/Engine.hpp  
-  include/simgrid/s4u/File.hpp  
-  include/simgrid/s4u/Host.hpp  
-  include/simgrid/s4u/Link.hpp  
+  include/simgrid/s4u/Engine.hpp
+  include/simgrid/s4u/Exec.hpp
+  include/simgrid/s4u/Host.hpp
+  include/simgrid/s4u/Io.hpp
+  include/simgrid/s4u/Link.hpp
   include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/NetZone.hpp
-  include/simgrid/s4u/Storage.hpp  
-  include/simgrid/s4u/VirtualMachine.hpp  
+  include/simgrid/s4u/Semaphore.hpp
+  include/simgrid/s4u/Storage.hpp
+  include/simgrid/s4u/VirtualMachine.hpp
   include/simgrid/s4u.hpp
-  include/simgrid/plugins/energy.h
-  include/simgrid/plugins/load.h
+
+  include/simgrid/kernel/resource/Action.hpp
+  include/simgrid/kernel/resource/Model.hpp
+  include/simgrid/kernel/resource/Resource.hpp
+
+  include/simgrid/kernel/routing/ClusterZone.hpp
+  include/simgrid/kernel/routing/DijkstraZone.hpp
+  include/simgrid/kernel/routing/DragonflyZone.hpp
+  include/simgrid/kernel/routing/EmptyZone.hpp
+  include/simgrid/kernel/routing/FatTreeZone.hpp
+  include/simgrid/kernel/routing/FloydZone.hpp
+  include/simgrid/kernel/routing/FullZone.hpp
+  include/simgrid/kernel/routing/NetPoint.hpp
+  include/simgrid/kernel/routing/NetZoneImpl.hpp
+  include/simgrid/kernel/routing/RoutedZone.hpp
+  include/simgrid/kernel/routing/TorusZone.hpp
+  include/simgrid/kernel/routing/VivaldiZone.hpp
+
   include/smpi/mpi.h
+  include/smpi/sampi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
+  include/smpi/smpi_helpers.h
+  include/smpi/smpi_helpers_internal.h
   include/smpi/smpi_extended_traces.h
   include/smpi/smpi_extended_traces_fortran.h
   include/smpi/forward.hpp
   include/xbt.h
-  include/xbt/algorithm.hpp
   include/xbt/asserts.h
   include/xbt/automaton.h
   include/xbt/automaton.hpp
-  include/xbt/backtrace.h
   include/xbt/backtrace.hpp
   include/xbt/base.h
   include/xbt/config.h
   include/xbt/config.hpp
-  include/xbt/cunit.h
   include/xbt/dict.h
   include/xbt/dynar.h
-  include/xbt/dynar.hpp
   include/xbt/ex.h
-  include/xbt/ex.hpp
-  include/xbt/exception.hpp
   include/xbt/Extendable.hpp
   include/xbt/file.hpp
   include/xbt/functional.hpp
@@ -727,7 +763,6 @@ set(headers_to_install
   include/xbt/log.hpp
   include/xbt/mallocator.h
   include/xbt/misc.h
-  include/xbt/mmalloc.h
   include/xbt/module.h
   include/xbt/parmap.h
   include/xbt/range.hpp
@@ -736,38 +771,22 @@ set(headers_to_install
   include/xbt/signal.hpp
   include/xbt/str.h
   include/xbt/string.hpp
-  include/xbt/swag.h
   include/xbt/synchro.h
   include/xbt/sysdep.h
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
   include/xbt/virtu.h
-  include/xbt/xbt_os_thread.h
   include/xbt/xbt_os_time.h
   )
 set(source_of_generated_headers
-  include/simgrid_config.h.in
+  include/simgrid/config.h.in
+  src/internal_config.h.in
+  src/simgrid/version.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper
-# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-endif()
-
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC    ${SURF_SRC}   src/xbt/xbt_os_thread.c)
-else() # NOT pthread
-  set(EXTRA_DIST  ${EXTRA_DIST} src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
+  set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
   set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
@@ -776,20 +795,20 @@ endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
-  ${PLUGINS_SRC}
-  ${BINDINGS_SRC}
-  ${MC_SRC_BASE}
-  ${MSG_SRC}
   ${S4U_SRC}
-  ${SIMDAG_SRC}
   ${SIMGRID_SRC}
+  ${MC_SRC_BASE}
   ${SIMIX_SRC}
   ${SURF_SRC}
   ${TRACING_SRC}
   ${XBT_SRC}
+  ${PLUGINS_SRC}
+  ${BINDINGS_SRC}
+  ${MSG_SRC}
+  ${SIMDAG_SRC}
   )
 
-if(${SIMGRID_HAVE_JEDULE})  
+if(${SIMGRID_HAVE_JEDULE})
   set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${JEDULE_SRC})
@@ -807,16 +826,6 @@ if(SIMGRID_HAVE_NS3)
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
 endif()
 
-# WINDOWS
-if(WIN32)
-  set(simgrid_sources
-    ${simgrid_sources}
-    src/kernel/context/ContextThread.cpp
-    src/kernel/context/ContextThread.hpp
-    src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(SIMGRID_HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
@@ -826,83 +835,103 @@ endif()
 set(DOC_SOURCES
   doc/Doxyfile.in
   doc/Layout.xml
-  doc/sg_thread_model.fig
-  doc/simix.fig
-  doc/surf_nutshell.fig
-  doc/surf++.png
-  doc/surf++.pdf
-  doc/surf++.graphml
-  doc/surf++.uml
-  doc/triva-graph_configuration.png
-  doc/triva-graph_configuration.svg
-  doc/triva-graph_visualization.png
-  doc/triva-graph_visualization.svg
-  doc/triva-time_interval.png
-  doc/triva-time_interval.svg
 
   doc/doxygen/FAQ.doc
-  doc/doxygen/application.doc
-  doc/doxygen/community.doc
-  doc/doxygen/deployment.doc
-  doc/doxygen/examples.doc
-  doc/doxygen/footer.html
-  doc/doxygen/getting_started.doc
-  doc/doxygen/header.html
-  doc/doxygen/howtos.doc
-  doc/doxygen/index.doc
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
   doc/doxygen/inside_cmake.doc
-  doc/doxygen/inside_doxygen.doc
   doc/doxygen/inside_extending.doc
   doc/doxygen/inside_release.doc
-  doc/doxygen/install.doc
-  doc/doxygen/install_yours.doc
-  doc/doxygen/java.doc
-  doc/doxygen/tutorial_msg.doc
-  doc/doxygen/tutorial_smpi.doc
-  doc/doxygen/models.doc
-  doc/doxygen/module-msg.doc
-  doc/doxygen/module-s4u.doc
   doc/doxygen/module-sd.doc
-  doc/doxygen/module-simix.doc
-  doc/doxygen/module-smpi.doc
   doc/doxygen/module-surf.doc
   doc/doxygen/module-trace.doc
   doc/doxygen/module-xbt.doc
   doc/doxygen/module-index.doc
-  doc/doxygen/ns3.doc
-  doc/doxygen/options.doc
-  doc/doxygen/outcomes.doc  
-  doc/doxygen/outcomes_logs.doc  
-  doc/doxygen/outcomes_MC.doc  
-  doc/doxygen/outcomes_vizu.doc  
+  doc/doxygen/outcomes_logs.doc
+  doc/doxygen/outcomes_vizu.doc
   doc/doxygen/platform.doc
   doc/doxygen/platform_lua.doc
-  doc/doxygen/scenario.doc
-  doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
   doc/doxygen/uhood_switch.doc
   doc/doxygen/uhood_arch.doc
 
-  doc/manpage/smpicc.1
-  doc/manpage/smpicxx.1
-  doc/manpage/smpif90.1
-  doc/manpage/smpiff.1
-  doc/manpage/smpirun.1
-  doc/manpage/tesh.pod
-
-  doc/msg-tuto-src/deployment0.xml
-  doc/msg-tuto-src/deployment1.xml
-  doc/msg-tuto-src/deployment2.xml
-  doc/msg-tuto-src/deployment3.xml
-  doc/msg-tuto-src/deployment_general.xml
-  doc/msg-tuto-src/Makefile
-  doc/msg-tuto-src/masterworker0.c
-  doc/msg-tuto-src/masterworker1.c
-  doc/msg-tuto-src/masterworker2.c
-  doc/msg-tuto-src/masterworker3.c
-  doc/msg-tuto-src/masterworker4.c
+  docs/manpages/smpicc.1
+  docs/manpages/smpicxx.1
+  docs/manpages/smpif90.1
+  docs/manpages/smpiff.1
+  docs/manpages/smpirun.1
+  docs/manpages/tesh.pod
+
+  docs/Build.sh
+  docs/requirements.txt
+  docs/source/conf.py
+  docs/source/Doxyfile
+  docs/source/_ext/hidden_code_block.py
+  docs/source/_ext/javasphinx-apidoc
+  docs/source/_ext/javasphinx/apidoc.py
+  docs/source/_ext/javasphinx/compiler.py
+  docs/source/_ext/javasphinx/domain.py
+  docs/source/_ext/javasphinx/extdoc.py
+  docs/source/_ext/javasphinx/formatter.py
+  docs/source/_ext/javasphinx/htmlrst.py
+  docs/source/_ext/javasphinx/__init__.py
+  docs/source/_ext/javasphinx/util.py
+  docs/source/_templates/breadcrumbs.html
+
+  docs/source/img/eclipseScreenShot.png
+  docs/source/img/extlink.png
+  docs/source/img/extlink.svg
+  docs/source/img/graphical-toc.svg
+  docs/source/img/lang_cpp.png
+  docs/source/img/lang_python.png
+  docs/source/img/smpi_simgrid_alltoall_pair_16.png
+  docs/source/img/smpi_simgrid_alltoall_ring_16.png
+  docs/source/img/zone_hierarchy.png
+
+  docs/ignored_symbols
+  docs/source/application.rst
+  docs/source/app_msg.rst
+  docs/source/app_s4u.rst
+  docs/source/app_smpi.rst
+  docs/source/community.rst
+  docs/source/Configuring_SimGrid.rst
+  docs/source/Deploying_your_Application.rst
+  docs/source/Experimental_Setup.rst
+  docs/source/index.rst
+  docs/source/Introduction.rst
+  docs/source/Installing_SimGrid.rst
+  docs/source/Start_Your_Own_Project.rst
+  docs/source/models.rst
+  docs/source/ns3.rst
+  docs/source/outcomes.rst
+  docs/source/platform.rst
+  docs/source/platform_howtos.rst
+  docs/source/Platform_Examples.rst
+  docs/source/XML_Reference.rst
+
+  docs/source/Tutorial_Algorithms.rst
+  docs/source/tuto_s4u/deployment1.xml
+  docs/source/tuto_s4u/deployment2.xml
+  docs/source/tuto_s4u/deployment3.xml
+  docs/source/tuto_s4u/deployment4.xml
+  docs/source/tuto_s4u/draw_gantt.R
+  docs/source/tuto_s4u/img/intro.svg
+  docs/source/tuto_s4u/img/question.svg
+  docs/source/tuto_s4u/img/result.png
+  docs/source/tuto_s4u/img/Rscript-screenshot.png
+  docs/source/tuto_s4u/img/vite-screenshot.png
+  docs/source/tuto_s4u/master-workers-lab1.cpp
+  docs/source/tuto_s4u/master-workers-lab2.cpp
+  docs/source/tuto_s4u/master-workers-lab3.cpp
+  docs/source/tuto_s4u/master-workers-lab4.cpp
+
+  docs/source/Tutorial_MPI_Applications.rst
+  docs/source/tuto_smpi/3hosts.png
+  docs/source/tuto_smpi/3hosts.xml
+  docs/source/tuto_smpi/img/big-picture.svg
+  docs/source/tuto_smpi/img/lu.S.4.png
+  docs/source/tuto_smpi/gemm_mpi.cpp
+  docs/source/tuto_smpi/roundtrip.c
 
   CITATION.bib
   )
@@ -920,8 +949,7 @@ set(DOC_TOOLS
 
 # these files get copied automatically to the html documentation
 set(DOC_IMG
-  ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
@@ -934,10 +962,6 @@ set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_pair_16.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_ring_16.png
   )
 
 set(bin_files
@@ -956,28 +980,29 @@ set(txt_files
   COPYING
   README.md
   ChangeLog
-  INSTALL
   LICENSE-LGPL-2.1
   NEWS
-  TODO
   )
 
-# The list of cmake build directories is constructed from the following list. 
+# The list of cmake build directories is constructed from the following list.
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
-  examples/java/CMakeLists.txt
-  examples/msg/CMakeLists.txt
-    examples/msg/mc/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt
-    examples/smpi/NAS/CMakeLists.txt
-    examples/smpi/smpi_msg_masterslave/CMakeLists.txt
-    examples/smpi/replay_multiple/CMakeLists.txt
-    examples/smpi/energy/f77/CMakeLists.txt
-    examples/smpi/energy/f90/CMakeLists.txt
+  examples/smpi/NAS/CMakeLists.txt
+  examples/smpi/smpi_msg_masterslave/CMakeLists.txt
+  examples/smpi/replay_multiple/CMakeLists.txt
+  examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
+  examples/smpi/energy/f77/CMakeLists.txt
+  examples/smpi/energy/f90/CMakeLists.txt
+  examples/python/CMakeLists.txt
+  examples/deprecated/java/CMakeLists.txt
+  examples/deprecated/msg/CMakeLists.txt
+  examples/deprecated/msg/mc/CMakeLists.txt
+  examples/deprecated/simdag/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
+  teshsuite/lua/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
   teshsuite/s4u/CMakeLists.txt
@@ -986,14 +1011,14 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
-  
+
   teshsuite/smpi/isp/umpire/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
   teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
-#  teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt
   teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
@@ -1018,7 +1043,7 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
-  
+
   tools/CMakeLists.txt
   tools/graphicator/CMakeLists.txt
   tools/tesh/CMakeLists.txt
@@ -1032,7 +1057,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/CTestCustom.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/GCCFlags.cmake
+  tools/cmake/Flags.cmake
   tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/Java.cmake
@@ -1046,25 +1071,16 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
-  tools/cmake/Modules/FindRngStream.cmake
+  tools/cmake/Modules/pybind11Config.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
+  tools/cmake/scripts/fixup_simgrid_dtd_l.pl
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
-  tools/cmake/UnitTesting.cmake
-  tools/cmake/src/internal_config.h.in
   tools/cmake/test_prog/prog_asan.cpp
-  tools/cmake/test_prog/prog_gnu_dynlinker.c
   tools/cmake/test_prog/prog_makecontext.c
-  tools/cmake/test_prog/prog_mutex_timedlock.c
-  tools/cmake/test_prog/prog_sem_init.c
-  tools/cmake/test_prog/prog_sem_open.c
-  tools/cmake/test_prog/prog_sem_timedwait.c
-  tools/cmake/test_prog/prog_snprintf.c
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
-  tools/cmake/test_prog/prog_thread_storage.c
-  tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
   tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as
@@ -1074,39 +1090,46 @@ set(CMAKE_SOURCE_FILES
   tools/stack-cleaner/clean-stack-filter
   tools/stack-cleaner/compiler-wrapper
   tools/stack-cleaner/README
+  
+  setup.py 
+  MANIFEST.in
+  MANIFEST.in.in
   )
 
 set(PLATFORMS_EXAMPLES
   examples/platforms/bypassASroute.xml
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
-  examples/platforms/cluster.xml
   examples/platforms/cluster_backbone.xml
+  examples/platforms/cluster_multi.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
-  examples/platforms/cluster_no_backbone.xml
-  examples/platforms/cluster_torus.xml
+  examples/platforms/cluster_crossbar.xml
   examples/platforms/cluster_fat_tree.xml
+  examples/platforms/cluster_fat_tree.svg
+  examples/platforms/cluster_torus.xml
+  examples/platforms/cluster_torus.svg
   examples/platforms/cluster_dragonfly.xml
+  examples/platforms/cluster_dragonfly.svg
   examples/platforms/crosstraffic.xml
   examples/platforms/optorsim/gridpp_grid_2004.conf
   examples/platforms/optorsim/lcg_sept2004_grid.conf
   examples/platforms/optorsim/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
-  examples/platforms/trace/bourassa_state.trace
-  examples/platforms/trace/fafard_state.trace
-  examples/platforms/trace/faulty_host.trace
-  examples/platforms/trace/ginette_state.trace
-  examples/platforms/trace/jupiter_speed.trace
-  examples/platforms/trace/jupiter_state.trace
-  examples/platforms/trace/link1_avail.trace
-  examples/platforms/trace/link3_state.trace
-  examples/platforms/trace/link4_state.trace
-  examples/platforms/trace/linkBandwidth7.bw
-  examples/platforms/trace/trace_A_failure.txt
-  examples/platforms/trace/trace_A.txt
-  examples/platforms/trace/trace_B.txt
+  examples/platforms/profiles/bourassa_state.profile
+  examples/platforms/profiles/fafard_state.profile
+  examples/platforms/profiles/faulty_host.profile
+  examples/platforms/profiles/ginette_state.profile
+  examples/platforms/profiles/jupiter_speed.profile
+  examples/platforms/profiles/jupiter_state.profile
+  examples/platforms/profiles/link1_bandwidth.profile
+  examples/platforms/profiles/link1_latency.profile
+  examples/platforms/profiles/link3_state.profile
+  examples/platforms/profiles/link4_state.profile
+  examples/platforms/profiles/trace_A_failure.txt
+  examples/platforms/profiles/trace_A.txt
+  examples/platforms/profiles/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
@@ -1130,9 +1153,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/small_platform.xml
   examples/platforms/small_platform.lua
   examples/platforms/small_platform_constant.xml
+  examples/platforms/small_platform_failures.xml
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml
-  examples/platforms/small_platform_with_failures.xml
+  examples/platforms/small_platform_profile.xml
   examples/platforms/small_platform_with_routers.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord
@@ -1141,7 +1165,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/three_multicore_hosts.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform_shared.xml
-  examples/platforms/two_hosts_platform_with_availability.xml
+  examples/platforms/two_hosts_profiles.xml
   examples/platforms/two_hosts_platform_with_availability_included.xml
   examples/platforms/two_peers.xml
   examples/platforms/vivaldi.xml