WIP. crude surf_file_t to FileImpl conversion

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e2f7c19..4c2e631 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -9,7 +9,6 @@ set(EXTRA_DIST
   src/mc/PageStore.hpp
   src/mc/mc_record.h
   src/include/simgrid/sg_config.h
-  src/include/smpi/smpi_interface.h
   src/include/smpi/smpi_utils.hpp
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
@@ -30,21 +29,12 @@ set(EXTRA_DIST
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
-  src/simix/ActorImpl.hpp
   src/simix/smx_synchro_private.h
-  src/kernel/activity/ActivityImpl.hpp
-  src/kernel/activity/SynchroComm.hpp
-  src/kernel/activity/SynchroExec.hpp
-  src/kernel/activity/SynchroIo.hpp
-  src/kernel/activity/SynchroSleep.hpp
-  src/kernel/activity/SynchroRaw.hpp
   src/smpi/colls/coll_tuned_topo.h
-  src/smpi/colls/colls.h
   src/smpi/colls/colls_private.h
   src/smpi/colls/smpi_mvapich2_selector_stampede.h
   src/smpi/private.h
   src/smpi/private.hpp
-  src/smpi/smpi_mpi_dt_private.h
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
@@ -57,17 +47,17 @@ set(EXTRA_DIST
   src/surf/network_ib.hpp
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
-  src/surf/plugins/energy.hpp
+  src/surf/trace_mgr_test.cpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/surf/storage_interface.hpp
+  src/surf/FileImpl.hpp
+  src/surf/StorageImpl.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
-  src/surf/surf_routing.hpp
   src/surf/PropertyHolder.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
@@ -80,8 +70,6 @@ set(EXTRA_DIST
   src/xbt/backtrace_dummy.cpp
   src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
-  src/xbt/ex_interface.h
-  src/xbt/fifo_private.h
   src/xbt/graph_private.h
   src/xbt/heap_private.h
   src/xbt/log_private.h
@@ -108,125 +96,152 @@ set(EXTRA_DIST
   )
 
 set(SMPI_SRC
-  src/smpi/colls/allgather-2dmesh.c
-  src/smpi/colls/allgather-3dmesh.c
-  src/smpi/colls/allgather-GB.c
-  src/smpi/colls/allgather-NTSLR-NB.c
-  src/smpi/colls/allgather-NTSLR.c
-  src/smpi/colls/allgather-SMP-NTS.c
-  src/smpi/colls/allgather-bruck.c
-  src/smpi/colls/allgather-loosely-lr.c
-  src/smpi/colls/allgather-ompi-neighborexchange.c
-  src/smpi/colls/allgather-pair.c
-  src/smpi/colls/allgather-mvapich-smp.c
-  src/smpi/colls/allgather-rdb.c
-  src/smpi/colls/allgather-rhv.c
-  src/smpi/colls/allgather-ring.c
-  src/smpi/colls/allgather-smp-simple.c
-  src/smpi/colls/allgather-spreading-simple.c
-  src/smpi/colls/allgatherv-GB.c
-  src/smpi/colls/allgatherv-mpich-rdb.c
-  src/smpi/colls/allgatherv-mpich-ring.c
-  src/smpi/colls/allgatherv-ompi-bruck.c
-  src/smpi/colls/allgatherv-ompi-neighborexchange.c
-  src/smpi/colls/allgatherv-pair.c
-  src/smpi/colls/allgatherv-ring.c
-  src/smpi/colls/allreduce-lr.c
-  src/smpi/colls/allreduce-ompi-ring-segmented.c
-  src/smpi/colls/allreduce-rab-rdb.c
-  src/smpi/colls/allreduce-rab1.c
-  src/smpi/colls/allreduce-rab2.c
-  src/smpi/colls/allreduce-rdb.c
-  src/smpi/colls/allreduce-redbcast.c
-  src/smpi/colls/allreduce-smp-binomial-pipeline.c
-  src/smpi/colls/allreduce-smp-binomial.c
-  src/smpi/colls/allreduce-smp-rdb.c
-  src/smpi/colls/allreduce-smp-rsag-lr.c
-  src/smpi/colls/allreduce-smp-rsag-rab.c
-  src/smpi/colls/allreduce-smp-rsag.c
-  src/smpi/colls/allreduce-mvapich-rs.c
-  src/smpi/colls/allreduce-mvapich-two-level.c
-  src/smpi/colls/alltoall-2dmesh.c
-  src/smpi/colls/alltoall-3dmesh.c
-#  src/smpi/colls/alltoall-bruck.c
-  src/smpi/colls/alltoall-pair-light-barrier.c
-  src/smpi/colls/alltoall-pair-mpi-barrier.c
-  src/smpi/colls/alltoall-pair-one-barrier.c
-  src/smpi/colls/alltoall-pair.c
-  src/smpi/colls/alltoall-rdb.c
-  src/smpi/colls/alltoall-ring-light-barrier.c
-  src/smpi/colls/alltoall-ring-mpi-barrier.c
-  src/smpi/colls/alltoall-ring-one-barrier.c
-  src/smpi/colls/alltoall-ring.c
-  src/smpi/colls/alltoall-mvapich-scatter-dest.c
-  src/smpi/colls/alltoallv-bruck.c
-  src/smpi/colls/alltoallv-ompi-basic-linear.c
-  src/smpi/colls/alltoallv-pair-light-barrier.c
-  src/smpi/colls/alltoallv-pair-mpi-barrier.c
-  src/smpi/colls/alltoallv-pair-one-barrier.c
-  src/smpi/colls/alltoallv-pair.c
-  src/smpi/colls/alltoallv-ring-light-barrier.c
-  src/smpi/colls/alltoallv-ring-mpi-barrier.c
-  src/smpi/colls/alltoallv-ring-one-barrier.c
-  src/smpi/colls/alltoallv-ring.c
-  src/smpi/colls/barrier-ompi.c
-  src/smpi/colls/barrier-mvapich2-pair.c
-  src/smpi/colls/bcast-NTSB.c
-  src/smpi/colls/bcast-NTSL-Isend.c
-  src/smpi/colls/bcast-NTSL.c
-  src/smpi/colls/bcast-SMP-binary.c
-  src/smpi/colls/bcast-SMP-binomial.c
-  src/smpi/colls/bcast-SMP-linear.c
-  src/smpi/colls/bcast-arrival-pattern-aware-wait.c
-  src/smpi/colls/bcast-arrival-pattern-aware.c
-  src/smpi/colls/bcast-arrival-scatter.c
-  src/smpi/colls/bcast-binomial-tree.c
-  src/smpi/colls/bcast-flattree-pipeline.c
-  src/smpi/colls/bcast-flattree.c
-  src/smpi/colls/bcast-ompi-pipeline.c
-  src/smpi/colls/bcast-ompi-split-bintree.c
-  src/smpi/colls/bcast-mvapich-smp.c
-  src/smpi/colls/bcast-scatter-LR-allgather.c
-  src/smpi/colls/bcast-scatter-rdb-allgather.c
-  src/smpi/colls/coll_tuned_topo.c
-  src/smpi/colls/colls_global.c
-  src/smpi/colls/gather-ompi.c
-  src/smpi/colls/gather-mvapich.c
-  src/smpi/colls/reduce-NTSL.c
-  src/smpi/colls/reduce-arrival-pattern-aware.c
-  src/smpi/colls/reduce-binomial.c
-  src/smpi/colls/reduce-flat-tree.c
-  src/smpi/colls/reduce-ompi.c
-  src/smpi/colls/reduce-scatter-gather.c
-  src/smpi/colls/reduce_scatter-mpich.c
-  src/smpi/colls/reduce_scatter-ompi.c
-  src/smpi/colls/reduce-mvapich-knomial.c
-  src/smpi/colls/reduce-mvapich-two-level.c
-  src/smpi/colls/reduce-rab.c
-  src/smpi/colls/scatter-ompi.c
-  src/smpi/colls/scatter-mvapich-two-level.c
+  src/smpi/colls/allgather/allgather-2dmesh.cpp
+  src/smpi/colls/allgather/allgather-3dmesh.cpp
+  src/smpi/colls/allgather/allgather-GB.cpp
+  src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
+  src/smpi/colls/allgather/allgather-NTSLR.cpp
+  src/smpi/colls/allgather/allgather-SMP-NTS.cpp
+  src/smpi/colls/allgather/allgather-bruck.cpp
+  src/smpi/colls/allgather/allgather-loosely-lr.cpp
+  src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
+  src/smpi/colls/allgather/allgather-pair.cpp
+  src/smpi/colls/allgather/allgather-mvapich-smp.cpp
+  src/smpi/colls/allgather/allgather-rdb.cpp
+  src/smpi/colls/allgather/allgather-rhv.cpp
+  src/smpi/colls/allgather/allgather-ring.cpp
+  src/smpi/colls/allgather/allgather-smp-simple.cpp
+  src/smpi/colls/allgather/allgather-spreading-simple.cpp
+  src/smpi/colls/allgatherv/allgatherv-GB.cpp
+  src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp
+  src/smpi/colls/allgatherv/allgatherv-mpich-ring.cpp
+  src/smpi/colls/allgatherv/allgatherv-ompi-bruck.cpp
+  src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
+  src/smpi/colls/allgatherv/allgatherv-pair.cpp
+  src/smpi/colls/allgatherv/allgatherv-ring.cpp
+  src/smpi/colls/allreduce/allreduce-lr.cpp
+  src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
+  src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-rab1.cpp
+  src/smpi/colls/allreduce/allreduce-rab2.cpp
+  src/smpi/colls/allreduce/allreduce-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-redbcast.cpp
+  src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
+  src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp
+  src/smpi/colls/allreduce/allreduce-smp-rsag.cpp
+  src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
+  src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp
+  src/smpi/colls/alltoall/alltoall-basic-linear.cpp
+  src/smpi/colls/alltoall/alltoall-2dmesh.cpp
+  src/smpi/colls/alltoall/alltoall-3dmesh.cpp
+  src/smpi/colls/alltoall/alltoall-bruck.cpp
+  src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-pair.cpp
+  src/smpi/colls/alltoall/alltoall-rdb.cpp
+  src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
+  src/smpi/colls/alltoall/alltoall-ring.cpp
+  src/smpi/colls/alltoall/alltoall-mvapich-scatter-dest.cpp
+  src/smpi/colls/alltoallv/alltoallv-bruck.cpp
+  src/smpi/colls/alltoallv/alltoallv-ompi-basic-linear.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-pair.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
+  src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
+  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/bcast/bcast-NTSB.cpp
+  src/smpi/colls/bcast/bcast-NTSL-Isend.cpp
+  src/smpi/colls/bcast/bcast-NTSL.cpp
+  src/smpi/colls/bcast/bcast-SMP-binary.cpp
+  src/smpi/colls/bcast/bcast-SMP-binomial.cpp
+  src/smpi/colls/bcast/bcast-SMP-linear.cpp
+  src/smpi/colls/bcast/bcast-arrival-pattern-aware-wait.cpp
+  src/smpi/colls/bcast/bcast-arrival-pattern-aware.cpp
+  src/smpi/colls/bcast/bcast-arrival-scatter.cpp
+  src/smpi/colls/bcast/bcast-binomial-tree.cpp
+  src/smpi/colls/bcast/bcast-flattree-pipeline.cpp
+  src/smpi/colls/bcast/bcast-flattree.cpp
+  src/smpi/colls/bcast/bcast-ompi-pipeline.cpp
+  src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
+  src/smpi/colls/bcast/bcast-mvapich-smp.cpp
+  src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
+  src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp
+  src/smpi/colls/coll_tuned_topo.cpp
+  src/smpi/colls/colls_global.cpp
+  src/smpi/colls/gather/gather-ompi.cpp
+  src/smpi/colls/gather/gather-mvapich.cpp
+  src/smpi/colls/reduce/reduce-NTSL.cpp
+  src/smpi/colls/reduce/reduce-arrival-pattern-aware.cpp
+  src/smpi/colls/reduce/reduce-binomial.cpp
+  src/smpi/colls/reduce/reduce-flat-tree.cpp
+  src/smpi/colls/reduce/reduce-ompi.cpp
+  src/smpi/colls/reduce/reduce-scatter-gather.cpp
+  src/smpi/colls/reduce_scatter/reduce_scatter-mpich.cpp
+  src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
+  src/smpi/colls/reduce/reduce-mvapich-knomial.cpp
+  src/smpi/colls/reduce/reduce-mvapich-two-level.cpp
+  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_automatic_selector.cpp
-  src/smpi/colls/smpi_mpich_selector.c
-  src/smpi/colls/smpi_intel_mpi_selector.c
-  src/smpi/colls/smpi_openmpi_selector.c
-  src/smpi/colls/smpi_mvapich2_selector.c
+  src/smpi/colls/smpi_default_selector.cpp
+  src/smpi/colls/smpi_mpich_selector.cpp
+  src/smpi/colls/smpi_intel_mpi_selector.cpp
+  src/smpi/colls/smpi_openmpi_selector.cpp
+  src/smpi/colls/smpi_mvapich2_selector.cpp
   src/smpi/instr_smpi.cpp
-  src/smpi/smpi_base.cpp
   src/smpi/smpi_bench.cpp
   src/smpi/smpi_memory.cpp
+  src/smpi/smpi_shared.cpp
   src/smpi/smpi_static_variables.cpp
   src/smpi/smpi_coll.cpp
+  src/smpi/smpi_coll.hpp
   src/smpi/smpi_comm.cpp
+  src/smpi/smpi_comm.hpp
   src/smpi/smpi_deployment.cpp
   src/smpi/smpi_dvfs.cpp
   src/smpi/smpi_global.cpp
+  src/smpi/smpi_f2c.cpp
+  src/smpi/smpi_f2c.hpp
   src/smpi/smpi_group.cpp
+  src/smpi/smpi_group.hpp
+  src/smpi/SmpiHost.cpp
+  src/smpi/SmpiHost.hpp
   src/smpi/smpi_mpi.cpp
-  src/smpi/smpi_mpi_dt.cpp
+  src/smpi/smpi_datatype.cpp
+  src/smpi/smpi_datatype.hpp
+  src/smpi/smpi_info.cpp
+  src/smpi/smpi_info.hpp
+  src/smpi/smpi_keyvals.cpp
+  src/smpi/smpi_keyvals.hpp
+  src/smpi/smpi_datatype_derived.cpp
+  src/smpi/smpi_datatype_derived.hpp
+  src/smpi/smpi_main.c
+  src/smpi/smpi_op.cpp
+  src/smpi/smpi_op.hpp
+  src/smpi/smpi_process.cpp
+  src/smpi/smpi_process.hpp
   src/smpi/smpi_pmpi.cpp
   src/smpi/smpi_replay.cpp
-  src/smpi/smpi_rma.cpp
+  src/smpi/smpi_request.cpp
+  src/smpi/smpi_request.hpp
+  src/smpi/smpi_status.cpp
+  src/smpi/smpi_status.hpp
+  src/smpi/smpi_win.cpp
+  src/smpi/smpi_win.hpp
   src/smpi/smpi_topo.cpp
+  src/smpi/smpi_topo.hpp
   src/smpi/smpi_utils.cpp
   src/smpi/smpi_f77.cpp
   
@@ -247,10 +262,8 @@ set(XBT_SRC
   src/xbt/dynar.cpp
   src/xbt/ex.cpp
   src/xbt/exception.cpp
-  src/xbt/fifo.c
   src/xbt/graph.c
   src/xbt/heap.c
-  src/xbt/lib.c
   src/xbt/log.c
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
@@ -263,13 +276,11 @@ set(XBT_SRC
   src/xbt/xbt_log_layout_format.c
   src/xbt/xbt_log_layout_simple.c
   src/xbt/xbt_main.cpp
-  src/xbt/xbt_matrix.c
   src/xbt/xbt_os_file.c
   src/xbt/xbt_os_synchro.c
   src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
-  src/xbt/xbt_strbuff.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
   )
@@ -296,8 +307,8 @@ set(SURF_SRC
   src/kernel/routing/FloydZone.hpp
   src/kernel/routing/FullZone.cpp
   src/kernel/routing/FullZone.hpp
-  src/kernel/routing/NetCard.cpp
-  src/kernel/routing/NetCard.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
@@ -321,14 +332,14 @@ set(SURF_SRC
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
-  src/surf/plugins/energy.cpp
+  src/surf/plugins/host_energy.cpp
+  src/surf/plugins/host_load.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp
-  src/surf/storage_interface.cpp
+  src/surf/StorageImpl.cpp
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
-  src/surf/surf_routing.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
@@ -363,15 +374,23 @@ set(SIMIX_SRC
   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/smx_vm.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
-  src/kernel/activity/SynchroComm.cpp
-  src/kernel/activity/SynchroExec.cpp
-  src/kernel/activity/SynchroSleep.cpp
-  src/kernel/activity/SynchroRaw.cpp
+  src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/CommImpl.cpp
+  src/kernel/activity/CommImpl.hpp
+  src/kernel/activity/ExecImpl.cpp
+  src/kernel/activity/ExecImpl.hpp
+  src/kernel/activity/MailboxImpl.cpp
+  src/kernel/activity/MailboxImpl.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
   
   ${SIMIX_GENERATED_SRC}
   )
@@ -391,15 +410,16 @@ endif()
 
 set(S4U_SRC
   src/s4u/s4u_actor.cpp
-  src/s4u/s4u_as.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_conditionVariable.cpp
+  src/s4u/s4u_netzone.cpp
   src/s4u/s4u_storage.cpp
 )
 
@@ -431,7 +451,6 @@ set(SIMDAG_SRC
   src/simdag/sd_dotloader.cpp
   src/simdag/sd_global.cpp
   src/simdag/sd_task.cpp
-  src/simdag/sd_workstation.cpp
   )
 
 set(BINDINGS_SRC
@@ -481,7 +500,6 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/Msg.java
   src/bindings/java/org/simgrid/msg/MsgException.java
   src/bindings/java/org/simgrid/msg/Mutex.java
-  src/bindings/java/org/simgrid/msg/NativeException.java
   src/bindings/java/org/simgrid/msg/Process.java
   src/bindings/java/org/simgrid/msg/ProcessKilledError.java
   src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
@@ -514,7 +532,6 @@ set(LUA_SRC
   )
 
 set(TRACING_SRC
-  src/instr/instr_TI_trace.cpp
   src/instr/instr_config.cpp
   src/instr/instr_interface.cpp
   src/instr/instr_paje_containers.cpp
@@ -525,7 +542,6 @@ set(TRACING_SRC
   src/instr/instr_private.h
   src/instr/instr_smpi.h
   src/instr/instr_resource_utilization.cpp
-  src/instr/instr_trace.cpp
   )
 
 set(JEDULE_SRC
@@ -550,17 +566,23 @@ set(MC_SRC_BASE
   )
 
 set(MC_SRC
-  src/mc/RemotePtr.hpp
+  src/mc/checker/Checker.cpp
+  src/mc/checker/Checker.hpp
+  src/mc/checker/CommunicationDeterminismChecker.cpp
+  src/mc/checker/CommunicationDeterminismChecker.hpp
+  src/mc/checker/SafetyChecker.cpp
+  src/mc/checker/SafetyChecker.hpp
+  src/mc/checker/LivenessChecker.cpp
+  src/mc/checker/LivenessChecker.hpp
+  src/mc/remote/Channel.cpp
+  src/mc/remote/Channel.hpp
+  src/mc/remote/Client.cpp
+  src/mc/remote/Client.hpp
+  src/mc/remote/RemotePtr.hpp
+  src/mc/remote/mc_protocol.h
+  src/mc/remote/mc_protocol.cpp
+  
   src/mc/AddressSpace.hpp
-  src/mc/AddressSpace.cpp
-  src/mc/Channel.cpp
-  src/mc/Channel.hpp
-  src/mc/Checker.cpp
-  src/mc/Checker.hpp
-  src/mc/Client.cpp
-  src/mc/Client.hpp
-  src/mc/CommunicationDeterminismChecker.cpp
-  src/mc/CommunicationDeterminismChecker.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
@@ -569,14 +591,11 @@ set(MC_SRC
   src/mc/ObjectInformation.cpp
   src/mc/PageStore.hpp
   src/mc/PageStore.cpp
-  src/mc/SafetyChecker.cpp
-  src/mc/SafetyChecker.hpp
   src/mc/ChunkedData.hpp
   src/mc/ChunkedData.cpp
   src/mc/RegionSnapshot.cpp
   src/mc/RegionSnapshot.hpp
   src/mc/Type.hpp
-  src/mc/Variable.cpp
   src/mc/Variable.hpp
   src/mc/mc_forward.hpp
   src/mc/Process.hpp
@@ -602,11 +621,8 @@ set(MC_SRC
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.h
-  src/mc/mc_mmalloc.h
-  src/mc/LivenessChecker.hpp
   src/mc/LocationList.hpp
   src/mc/LocationList.cpp
-  src/mc/LivenessChecker.cpp
   src/mc/mc_record.cpp
   src/mc/mc_member.cpp
   src/mc/mc_memory.cpp
@@ -619,8 +635,6 @@ set(MC_SRC
   src/mc/VisitedState.cpp
   src/mc/VisitedState.hpp
   src/mc/mc_client_api.cpp
-  src/mc/mc_protocol.h
-  src/mc/mc_protocol.cpp
   src/mc/mc_smx.h
   src/mc/mc_smx.cpp
   src/mc/mc_xbt.hpp
@@ -629,7 +643,7 @@ set(MC_SRC
   src/mc/Transition.hpp
   )
 
-set(MC_SIMGRID_MC_SRC  src/mc/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
   include/msg/msg.h
@@ -638,6 +652,7 @@ set(headers_to_install
   include/simdag/datatypes.h
   include/simgrid/chrono.hpp
   include/simgrid/plugins/energy.h
+  include/simgrid/plugins/load.h
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
@@ -653,24 +668,26 @@ set(headers_to_install
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
-  include/simgrid/s4u/As.hpp
-  include/simgrid/s4u/comm.hpp
-  include/simgrid/s4u/engine.hpp  
-  include/simgrid/s4u/file.hpp  
-  include/simgrid/s4u/host.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/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
-  include/simgrid/s4u/conditionVariable.hpp
-  include/simgrid/s4u/storage.hpp  
+  include/simgrid/s4u/NetZone.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/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
   include/smpi/smpi_extended_traces.h
   include/smpi/smpi_extended_traces_fortran.h
-  include/surf/surf_routing.h
+  include/smpi/forward.hpp
   include/xbt.h
   include/xbt/RngStream.h
   include/xbt/asserts.h
@@ -690,28 +707,23 @@ set(headers_to_install
   include/xbt/exception.hpp
   include/xbt/backtrace.h
   include/xbt/backtrace.hpp
-  include/xbt/fifo.h
   include/xbt/file.h
   include/xbt/function_types.h
   include/xbt/functional.hpp
   include/xbt/future.hpp
   include/xbt/graph.h
   include/xbt/heap.h
-  include/xbt/lib.h
   include/xbt/Extendable.hpp
   include/xbt/log.h
   include/xbt/log.hpp
   include/xbt/mallocator.h
-  include/xbt/matrix.h
-  include/xbt/memory.hpp
   include/xbt/misc.h
   include/xbt/mmalloc.h
   include/xbt/module.h
   include/xbt/parmap.h
   include/xbt/range.hpp
-  include/xbt/replay.h
+  include/xbt/replay.hpp
   include/xbt/str.h
-  include/xbt/strbuff.h
   include/xbt/swag.h
   include/xbt/synchro.h
   include/xbt/sysdep.h
@@ -763,7 +775,7 @@ set(simgrid_sources
   ${XBT_SRC}
   )
 
-if(${HAVE_JEDULE})  
+if(${SIMGRID_HAVE_JEDULE})  
   set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${JEDULE_SRC})
@@ -773,11 +785,11 @@ if(enable_smpi)
   set(simgrid_sources  ${simgrid_sources}  ${SMPI_SRC})
 endif()
 
-if(HAVE_MC)
+if(SIMGRID_HAVE_MC)
   set(simgrid_sources  ${simgrid_sources}  ${MC_SRC})
 endif()
 
-if(HAVE_NS3)
+if(SIMGRID_HAVE_NS3)
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
 endif()
 
@@ -791,7 +803,7 @@ if(WIN32)
     )
 endif()
 
-if(HAVE_LUA)
+if(SIMGRID_HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${LUA_SRC})
@@ -833,7 +845,8 @@ set(DOC_SOURCES
   doc/doxygen/install.doc
   doc/doxygen/install_yours.doc
   doc/doxygen/java.doc
-  doc/doxygen/tutorial.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
@@ -870,6 +883,7 @@ set(DOC_SOURCES
   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
@@ -926,7 +940,7 @@ set(txt_files
   ${txt_files}
   AUTHORS
   COPYING
-  README
+  README.md
   ChangeLog
   INSTALL
   LICENSE-LGPL-2.1
@@ -952,6 +966,7 @@ set(CMAKEFILES_TXT
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
+  teshsuite/s4u/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
   teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
@@ -1050,6 +1065,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
   examples/platforms/cluster.xml
+  examples/platforms/cluster_backbone.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml
@@ -1078,6 +1094,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
+  examples/platforms/energy_cluster.xml
   examples/platforms/faulty_host.xml
   examples/platforms/g5k.xml
   examples/platforms/griffon.xml
@@ -1105,7 +1122,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_meridian.syscoord
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/three_multicore_hosts.xml
-  examples/platforms/two_clusters.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform_shared.xml
   examples/platforms/two_hosts_platform_with_availability.xml