X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/844c9baa41ffb9963bbbe8146b36b9323cc4ca6f..db176451b42c9d524f82e6bb9951447e098dd492:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index c14bf259e9..e7ab091d90 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -9,7 +9,7 @@ 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 src/include/surf/surf.h @@ -17,7 +17,7 @@ set(EXTRA_DIST src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h - src/simdag/simdag_private.h + src/simdag/simdag_private.hpp src/simix/simcalls.in src/simix/simcalls.py src/simix/popping_private.h @@ -29,22 +29,18 @@ set(EXTRA_DIST src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h - src/simix/smx_process_private.h src/simix/smx_synchro_private.h - src/simix/Synchro.h - src/simix/SynchroComm.hpp - src/simix/SynchroExec.hpp - src/simix/SynchroIo.hpp - src/simix/SynchroSleep.hpp - src/simix/SynchroRaw.hpp - src/smpi/README + 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,31 +53,16 @@ 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/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/surf/AsImpl.hpp - src/surf/AsCluster.hpp - src/surf/AsClusterFatTree.hpp - src/surf/AsClusterTorus.hpp - src/surf/AsDijkstra.hpp - src/surf/AsFloyd.hpp - src/surf/AsFull.hpp - src/surf/AsRoutedGraph.hpp - src/surf/AsNone.hpp - src/surf/AsVivaldi.hpp - src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.h - src/surf/surf_routing.hpp - src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp - src/surf/virtual_machine.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -90,11 +71,9 @@ set(EXTRA_DIST src/xbt/automaton/parserPromela.tab.cacc src/xbt/automaton/parserPromela.tab.hacc src/xbt/automaton/parserPromela.yacc - src/xbt/backtrace_dummy.c - src/xbt/backtrace_linux.c + 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 @@ -115,143 +94,174 @@ set(EXTRA_DIST teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh + + examples/java/.classpath + examples/java/.project ) 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/smpi_automatic_selector.c - 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/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_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_c99.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/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_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 + + src/surf/network_smpi.cpp + src/surf/network_ib.cpp ) set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c + src/xbt/backtrace.cpp src/xbt/config.cpp - src/xbt/cunit.c - src/xbt/dict.c + src/xbt/cunit.cpp + src/xbt/dict.cpp src/xbt/dict_cursor.c src/xbt/dict_elm.c - src/xbt/dynar.c - src/xbt/ex.c - src/xbt/fifo.c + src/xbt/dynar.cpp + src/xbt/ex.cpp + src/xbt/exception.cpp src/xbt/graph.c src/xbt/heap.c src/xbt/lib.c @@ -266,13 +276,13 @@ set(XBT_SRC src/xbt/xbt_log_appender_file.c src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c - src/xbt/xbt_main.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.c - src/xbt/xbt_str.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 @@ -286,17 +296,34 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC - src/surf/AsImpl.cpp - src/surf/AsCluster.cpp - src/surf/AsClusterFatTree.cpp - src/surf/AsClusterTorus.cpp - src/surf/AsDijkstra.cpp - src/surf/AsFloyd.cpp - src/surf/AsFull.cpp - src/surf/AsRoutedGraph.cpp - src/surf/AsNone.cpp - src/surf/AsVivaldi.cpp + 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/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 @@ -308,51 +335,59 @@ set(SURF_SRC src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp - src/surf/network_smpi.cpp - src/surf/network_ib.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/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 src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp - src/surf/vm_hl13.cpp - src/surf/virtual_machine.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp ) +set(PLUGINS_SRC + 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 + ) + 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/simix/Context.cpp - src/simix/ContextRaw.cpp + src/kernel/context/Context.cpp + src/kernel/context/Context.hpp + src/kernel/context/ContextRaw.cpp 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/smx_process.cpp + src/simix/ActorImpl.cpp + src/simix/ActorImpl.hpp src/simix/smx_synchro.cpp - src/simix/smx_vm.cpp src/simix/popping.cpp - src/simix/Synchro.cpp - src/simix/SynchroComm.cpp - src/simix/SynchroExec.cpp - src/simix/SynchroSleep.cpp - src/simix/SynchroRaw.cpp - src/simix/SynchroIo.cpp + src/kernel/activity/ActivityImpl.cpp + src/kernel/activity/MailboxImpl.cpp + src/kernel/activity/MailboxImpl.hpp + src/kernel/activity/SynchroComm.cpp + src/kernel/activity/SynchroExec.cpp + src/kernel/activity/SynchroSleep.cpp + src/kernel/activity/SynchroRaw.cpp + src/kernel/activity/SynchroIo.cpp ${SIMIX_GENERATED_SRC} ) @@ -361,24 +396,27 @@ set(SIMIX_SRC if (HAVE_BOOST_CONTEXTS) set(SIMIX_SRC ${SIMIX_SRC} - src/simix/ContextBoost.hpp - src/simix/ContextBoost.cpp) + src/kernel/context/ContextBoost.hpp + src/kernel/context/ContextBoost.cpp) else() set(EXTRA_DIST ${EXTRA_DIST} - src/simix/ContextBoost.hpp - src/simix/ContextBoost.cpp) + src/kernel/context/ContextBoost.hpp + src/kernel/context/ContextBoost.cpp) 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_netzone.cpp src/s4u/s4u_storage.cpp ) @@ -391,7 +429,6 @@ set(SIMGRID_SRC set(MSG_SRC src/msg/instr_msg_process.cpp src/msg/instr_msg_task.cpp - src/msg/instr_msg_vm.cpp src/msg/msg_actions.cpp src/msg/msg_deployment.cpp src/msg/msg_environment.cpp @@ -408,15 +445,10 @@ set(MSG_SRC set(SIMDAG_SRC src/simdag/sd_daxloader.cpp + src/simdag/sd_dotloader.cpp src/simdag/sd_global.cpp src/simdag/sd_task.cpp - src/simdag/sd_workstation.cpp ) -if(HAVE_GRAPHVIZ) - set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp) -else() - set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.cpp) -endif() set(BINDINGS_SRC src/bindings/lua/lua_private.h @@ -465,7 +497,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 @@ -513,12 +544,12 @@ set(TRACING_SRC ) set(JEDULE_SRC - include/simgrid/jedule/jedule_events.h - include/simgrid/jedule/jedule_output.h - include/simgrid/jedule/jedule_platform.h + include/simgrid/jedule/jedule_events.hpp + include/simgrid/jedule/jedule.hpp + include/simgrid/jedule/jedule_platform.hpp include/simgrid/jedule/jedule_sd_binding.h src/instr/jedule/jedule_events.cpp - src/instr/jedule/jedule_output.cpp + src/instr/jedule/jedule.cpp src/instr/jedule/jedule_platform.cpp src/instr/jedule/jedule_sd_binding.cpp ) @@ -534,17 +565,24 @@ 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 @@ -553,8 +591,6 @@ 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 @@ -586,11 +622,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 @@ -603,8 +636,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 @@ -613,43 +644,51 @@ 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 include/msg/datatypes.h include/simdag/simdag.h 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 - include/simgrid.h include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h include/simgrid/simix.hpp + include/simgrid/simix/blocking_simcall.hpp + include/simgrid/kernel/future.hpp include/simgrid/host.h include/simgrid/link.h include/simgrid/s4u/forward.hpp - include/simgrid/s4u/actor.hpp - include/simgrid/s4u/As.hpp include/simgrid/s4u/Activity.hpp + include/simgrid/s4u/Actor.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/mailbox.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.h + 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/smpi/forward.hpp include/surf/surf_routing.h include/xbt.h include/xbt/RngStream.h @@ -666,14 +705,20 @@ set(headers_to_install include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h - include/xbt/fifo.h + include/xbt/ex.hpp + include/xbt/exception.hpp + include/xbt/backtrace.h + include/xbt/backtrace.hpp 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 @@ -682,13 +727,14 @@ set(headers_to_install 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_core.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 @@ -700,11 +746,11 @@ set(source_of_generated_headers ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC ${SURF_SRC} src/simix/ContextThread.cpp - src/simix/ContextThread.hpp ) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp ) else() # NOT pthread - set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp - src/simix/ContextThread.hpp ) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp ) endif() if(${HAVE_THREAD_CONTEXTS}) #pthread @@ -715,13 +761,14 @@ else() # NOT pthread endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/simix/ContextUnix.cpp) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextUnix.cpp) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp) endif() ### Simgrid Lib sources set(simgrid_sources + ${PLUGINS_SRC} ${BINDINGS_SRC} ${MC_SRC_BASE} ${MSG_SRC} @@ -756,8 +803,8 @@ endif() if(WIN32) set(simgrid_sources ${simgrid_sources} - src/simix/ContextThread.cpp - src/simix/ContextThread.hpp + src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp src/xbt/xbt_os_thread.c ) endif() @@ -787,16 +834,13 @@ set(DOC_SOURCES doc/doxygen/FAQ.doc doc/doxygen/application.doc - doc/doxygen/bindings.doc doc/doxygen/community.doc - doc/doxygen/community_contact.doc - doc/doxygen/community_extend.doc - doc/doxygen/community_giveback.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 @@ -805,9 +849,13 @@ set(DOC_SOURCES doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/install.doc - doc/doxygen/tutorial.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 @@ -826,18 +874,22 @@ set(DOC_SOURCES 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 @@ -895,8 +947,6 @@ set(txt_files AUTHORS COPYING README - README.java - README.lua ChangeLog INSTALL LICENSE-LGPL-2.1 @@ -922,6 +972,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 @@ -967,6 +1018,7 @@ set(CMAKEFILES_TXT set(CMAKE_SOURCE_FILES CMakeLists.txt + FindSimGrid.cmake tools/cmake/Tests.cmake tools/cmake/CTestConfig.cmake tools/cmake/CTestCustom.cmake @@ -978,25 +1030,16 @@ set(CMAKE_SOURCE_FILES tools/cmake/Java.cmake tools/cmake/MakeLib.cmake tools/cmake/MakeLibWin.cmake - tools/cmake/Modules/FindGFortran.cmake tools/cmake/Modules/FindGraphviz.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibunwind.cmake + tools/cmake/Modules/FindLibevent.cmake tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake tools/cmake/Modules/FindRngStream.cmake - tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/scripts/IPC/Run.pm - tools/cmake/scripts/IPC/Run/Debug.pm - tools/cmake/scripts/IPC/Run/IO.pm - tools/cmake/scripts/IPC/Run/Timer.pm - tools/cmake/scripts/IPC/Run/Win32Helper.pm - tools/cmake/scripts/IPC/Run/Win32IO.pm - tools/cmake/scripts/IPC/Run/Win32Pump.pm - tools/cmake/scripts/Diff.pm tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake @@ -1024,7 +1067,6 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/2clusters.xml examples/platforms/bypassASroute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml @@ -1032,7 +1074,9 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml - examples/platforms/clusters_routing_full.xml + examples/platforms/cluster_torus.xml + examples/platforms/cluster_fat_tree.xml + examples/platforms/cluster_dragonfly.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf @@ -1055,14 +1099,13 @@ 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/fat_tree_cluster.xml examples/platforms/g5k.xml examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/onelink.xml - examples/platforms/platform.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua @@ -1084,9 +1127,8 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_meridian.syscoord examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/three_multicore_hosts.xml - examples/platforms/torus_cluster.xml + examples/platforms/two_clusters.xml examples/platforms/two_hosts.xml - examples/platforms/two_hosts_platform.xml examples/platforms/two_hosts_platform_shared.xml examples/platforms/two_hosts_platform_with_availability.xml examples/platforms/two_hosts_platform_with_availability_included.xml