X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db82f9e75280108116a8e70d2e7a163080020d29..e27975bc4e43d1cd38725a26323d766beedb0cd0:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 4e42ec5b46..638ac0b3d4 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1,11 +1,12 @@ ### define source packages set(EXTRA_DIST - include/xbt/win32_ucontext.h - src/bindings/java/MANIFEST.MF + src/bindings/java/MANIFEST.MF.in src/include/instr/instr_interface.h src/include/mc/datatypes.h src/include/mc/mc.h + src/mc/mc_mmu.h + src/mc/mc_page_store.h src/include/simgrid/platf_interface.h src/include/simgrid/sg_config.h src/include/smpi/smpi_interface.h @@ -17,9 +18,8 @@ set(EXTRA_DIST src/include/surf/surf_resource_lmm.h src/include/surf/surfxml_parse_values.h src/include/surf/trace_mgr.h + src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h - src/include/xbt/xbt_os_time.h - src/mk_supernovae.pl src/msg/msg_mailbox.h src/msg/msg_private.h src/portable.h @@ -27,38 +27,70 @@ set(EXTRA_DIST src/simdag/dax_dtd.c src/simdag/dax_dtd.h src/simdag/private.h + src/simix/simcalls.in + src/simix/simcalls.py + src/simix/popping_private.h + src/simix/popping_bodies.c + src/simix/popping_generated.c + 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/smx_process_private.h - src/simix/smx_smurf_private.h src/simix/smx_synchro_private.h src/smpi/README - src/smpi/colls/COPYRIGHTS + 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/smpi_mpi_dt_private.h - src/surf/cpu_ti_private.h + src/surf/cpu_cas01.hpp + src/surf/cpu_interface.hpp + src/surf/cpu_ti.hpp src/surf/gtnets/gtnets_interface.h src/surf/gtnets/gtnets_simulator.h src/surf/gtnets/gtnets_topology.h - src/surf/maxmin_private.h - src/surf/network_gtnets_private.h - src/surf/network_ns3_private.h - src/surf/network_private.h + src/surf/maxmin_private.hpp + src/surf/network_cm02.hpp + src/surf/network_constant.hpp + src/surf/network_gtnets.hpp + src/surf/network_interface.hpp + src/surf/network_ns3.hpp + src/surf/network_smpi.hpp + src/surf/network_ib.hpp src/surf/ns3/my-point-to-point-helper.h src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h src/surf/ns3/red-queue.h src/surf/platf_generator_private.h + src/surf/plugins/energy.hpp src/surf/simgrid.dtd src/surf/simgrid_dtd.c - src/surf/storage_private.h + src/surf/storage_interface.hpp + src/surf/storage_n11.hpp + src/surf/surf_interface.hpp src/surf/surf_private.h - src/surf/surf_routing_private.h + src/surf/surf_routing.hpp + src/surf/surf_routing_cluster.hpp + src/surf/surf_routing_cluster_fat_tree.hpp + src/surf/surf_routing_cluster_torus.hpp + src/surf/surf_routing_dijkstra.hpp + src/surf/surf_routing_floyd.hpp + src/surf/surf_routing_full.hpp + src/surf/surf_routing_generic.hpp + src/surf/surf_routing_none.hpp + src/surf/surf_routing_private.hpp + src/surf/surf_routing_vivaldi.hpp src/surf/surfxml_parse.c src/surf/trace_mgr_private.h + src/surf/vm_workstation_hl13.hpp + src/surf/vm_workstation_interface.hpp + src/surf/workstation_clm03.hpp + src/surf/workstation_interface.hpp + src/surf/workstation_ptask_L07.hpp src/win32/config.h src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.lex @@ -80,7 +112,6 @@ set(EXTRA_DIST src/xbt/mallocator_private.h src/xbt/mmalloc/mfree.c src/xbt/mmalloc/mm.c - src/xbt/mmalloc/mm_diff.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c src/xbt/mmalloc/mmalloc.c @@ -94,102 +125,132 @@ set(EXTRA_DIST src/xbt/win32_ucontext.c tools/tesh/run_context.h tools/tesh/tesh.h + tools/tesh/generate_tesh + examples/smpi/mc/non_deterministic.tesh + examples/smpi/mc/send_deterministic.tesh ) set(SMPI_SRC - src/smpi/instr_smpi.c - src/smpi/smpi_base.c - src/smpi/smpi_bench.c - src/smpi/smpi_c99.c - src/smpi/smpi_coll.c - src/smpi/smpi_comm.c - src/smpi/smpi_global.c - src/smpi/smpi_group.c - src/smpi/smpi_mpi.c - src/smpi/smpi_mpi_dt.c - src/smpi/smpi_pmpi.c - src/smpi/smpi_replay.c - #src/smpi/colls/allgather-2dmesh.c - #src/smpi/colls/allgather-3dmesh.c - #src/smpi/colls/allgather-bruck.c + src/smpi/colls/allgather-2dmesh.c + src/smpi/colls/allgather-3dmesh.c src/smpi/colls/allgather-GB.c - src/smpi/colls/allgather-loosely-lr.c - src/smpi/colls/allgather-lr.c - src/smpi/colls/allgather-NTSLR.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-RDB.c src/smpi/colls/allgather-rhv.c src/smpi/colls/allgather-ring.c - src/smpi/colls/allgather-SMP-NTS.c src/smpi/colls/allgather-smp-simple.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-NTS.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-rab-rdb.c - #src/smpi/colls/allreduce-rab-reduce-scatter.c - src/smpi/colls/allreduce-rab-rsag.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-binomial-pipeline.c src/smpi/colls/allreduce-smp-rdb.c - src/smpi/colls/allreduce-smp-rsag.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.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.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-simple.c - src/smpi/colls/bcast-arrival-nb.c - src/smpi/colls/bcast-arrival-pattern-aware.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.c src/smpi/colls/bcast-flattree-pipeline.c - src/smpi/colls/bcast-NTSB.c - src/smpi/colls/bcast-NTSL.c - src/smpi/colls/bcast-NTSL-Isend.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/bcast-SMP-binary.c - src/smpi/colls/bcast-SMP-binomial.c - src/smpi/colls/bcast-SMP-linear.c - src/smpi/colls/bcast-TSB.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-NTSL.c + src/smpi/colls/reduce-ompi.c src/smpi/colls/reduce-scatter-gather.c - src/smpi/colls/star-reduction.c - ) - -if(SMPI_F2C) - set(SMPI_SRC - ${SMPI_SRC} - src/smpi/smpi_f77.c - ) -else() - set(EXTRA_DIST - ${EXTRA_DIST} - src/smpi/smpi_f77.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/instr_smpi.c + src/smpi/smpi_base.c + src/smpi/smpi_bench.c + src/smpi/smpi_c99.c + src/smpi/smpi_coll.c + src/smpi/smpi_comm.c + src/smpi/smpi_deployment.c + src/smpi/smpi_dvfs.c + src/smpi/smpi_global.c + src/smpi/smpi_group.c + src/smpi/smpi_mpi.c + src/smpi/smpi_mpi_dt.c + src/smpi/smpi_pmpi.c + src/smpi/smpi_replay.c + src/smpi/smpi_rma.c + src/smpi/smpi_topo.c + src/smpi/smpi_f77.c ) -endif() - set(XBT_SRC src/xbt/RngStream.c @@ -232,7 +293,7 @@ set(XBT_SRC src/xbt_modinter.h ) -if(HAVE_MMAP) +if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c @@ -243,11 +304,11 @@ set(GTNETS_SRC src/surf/gtnets/gtnets_interface.cc src/surf/gtnets/gtnets_simulator.cc src/surf/gtnets/gtnets_topology.cc - src/surf/network_gtnets.c + src/surf/network_gtnets.cpp ) set(NS3_SRC - src/surf/network_ns3.c + src/surf/network_ns3.cpp src/surf/ns3/my-point-to-point-helper.cc src/surf/ns3/ns3_interface.cc src/surf/ns3/ns3_simulator.cc @@ -255,41 +316,53 @@ set(NS3_SRC ) set(SURF_SRC - src/surf/cpu_cas01.c - src/surf/cpu_ti.c - src/surf/fair_bottleneck.c + src/surf/cpu_cas01.cpp + src/surf/cpu_interface.cpp + src/surf/cpu_ti.cpp + src/surf/fair_bottleneck.cpp src/surf/instr_routing.c src/surf/instr_surf.c - src/surf/lagrange.c - src/surf/maxmin.c - src/surf/network.c - src/surf/network_constant.c + src/surf/lagrange.cpp + src/surf/maxmin.cpp + 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/platf_generator.c + src/surf/plugins/energy.cpp src/surf/random_mgr.c src/surf/sg_platf.c - src/surf/storage.c - src/surf/surf.c - src/surf/surf_action.c - src/surf/surf_model.c - src/surf/surf_routing.c - src/surf/surf_routing_cluster.c - src/surf/surf_routing_dijkstra.c - src/surf/surf_routing_floyd.c - src/surf/surf_routing_full.c - src/surf/surf_routing_generic.c - src/surf/surf_routing_none.c - src/surf/surf_routing_rulebased.c - src/surf/surf_routing_vivaldi.c + 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/surf_routing_cluster.cpp + src/surf/surf_routing_cluster_fat_tree.cpp + src/surf/surf_routing_cluster_torus.cpp + src/surf/surf_routing_dijkstra.cpp + src/surf/surf_routing_floyd.cpp + src/surf/surf_routing_full.cpp + src/surf/surf_routing_generic.cpp + src/surf/surf_routing_none.cpp + src/surf/surf_routing_vivaldi.cpp src/surf/surfxml_parse.c src/surf/surfxml_parseplatf.c src/surf/trace_mgr.c - src/surf/workstation.c - src/surf/workstation_ptask_L07.c - src/surf/vm_workstation.c + src/surf/vm_workstation_hl13.cpp + src/surf/vm_workstation_interface.cpp + src/surf/workstation_clm03.cpp + src/surf/workstation_interface.cpp + src/surf/workstation_ptask_L07.cpp src/xbt/xbt_sg_stubs.c ) +set(SIMIX_GENERATED_SRC + src/simix/popping_generated.c + ) set(SIMIX_SRC + src/simix/libsmx.c src/simix/smx_context.c src/simix/smx_context_base.c src/simix/smx_context_raw.c @@ -300,10 +373,10 @@ set(SIMIX_SRC src/simix/smx_io.c src/simix/smx_network.c src/simix/smx_process.c - src/simix/smx_smurf.c src/simix/smx_synchro.c - src/simix/smx_user.c src/simix/smx_vm.c + src/simix/popping.c + ${SIMIX_GENERATED_SRC} ) set(SIMGRID_SRC @@ -323,40 +396,11 @@ set(MSG_SRC src/msg/msg_io.c src/msg/msg_mailbox.c src/msg/msg_process.c + src/msg/msg_synchro.c src/msg/msg_task.c src/msg/msg_vm.c ) -#* ****************************************************************************************** *# -#* TUTORIAL: New API *# - -set(MSG_SRC - ${MSG_SRC} - src/msg/msg_new_api.c - ) -set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/smx_new_api_private.h - ) -set(SIMIX_SRC - ${SIMIX_SRC} - src/simix/smx_new_api.c -) -#* ****************************************************************************************** *# - -#* ****************************************************************************************** *# -#* TUTORIAL: New Model *# - -set(SURF_SRC - ${SURF_SRC} - src/surf/new_model.c - ) -set(EXTRA_DIST - ${EXTRA_DIST} - src/surf/new_model_private.h - ) -#* ****************************************************************************************** *# - set(SIMDAG_SRC src/simdag/instr_sd_task.c src/simdag/sd_daxloader.c @@ -383,6 +427,42 @@ set(BINDINGS_SRC src/bindings/lua/simgrid_lua.h ) +set(JSURF_SWIG_SRC + src/bindings/java/surf.i +) + +set(JSURF_SWIG_SRC_EXTRA + src/bindings/java/surfdoc.i +) + +set(JSURF_JAVA_C_SRC + src/bindings/java/surf_swig.cpp + src/bindings/java/surf_swig.hpp +) + +set(JSURF_JAVA_GENERATED_SRC + src/bindings/java/org/simgrid/surf/Action.java + src/bindings/java/org/simgrid/surf/ActionList.java + src/bindings/java/org/simgrid/surf/ActionState.java + src/bindings/java/org/simgrid/surf/Cpu.java + src/bindings/java/org/simgrid/surf/CpuAction.java + src/bindings/java/org/simgrid/surf/CpuModel.java + src/bindings/java/org/simgrid/surf/LmmConstraint.java + src/bindings/java/org/simgrid/surf/LmmVariable.java + src/bindings/java/org/simgrid/surf/Model.java + src/bindings/java/org/simgrid/surf/NetworkAction.java + src/bindings/java/org/simgrid/surf/NetworkLink.java + src/bindings/java/org/simgrid/surf/Plugin.java + src/bindings/java/org/simgrid/surf/Resource.java + src/bindings/java/org/simgrid/surf/ResourceState.java + src/bindings/java/org/simgrid/surf/RoutingEdge.java + src/bindings/java/org/simgrid/surf/Surf.java + src/bindings/java/org/simgrid/surf/SurfJNI.java + src/bindings/java/org/simgrid/surf/TmgrTrace.java + src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java + src/bindings/java/org/simgrid/surf/XbtDict.java +) + set(JMSG_C_SRC src/bindings/java/jmsg.c src/bindings/java/jmsg.h @@ -410,10 +490,19 @@ set(JMSG_C_SRC src/bindings/java/smx_context_cojava.h src/bindings/java/smx_context_java.c src/bindings/java/smx_context_java.h + src/bindings/java/jmsg_storage.c + src/bindings/java/jmsg_storage.h +) + +set(JSURF_C_SRC + src/bindings/java/surfJAVA_wrap.cxx + src/bindings/java/surfJAVA_wrap.h + ${JSURF_JAVA_C_SRC} ) set(JMSG_JAVA_SRC - src/bindings/java/org/simgrid/msg/As.java + src/bindings/java/org/simgrid/NativeLib.java + src/bindings/java/org/simgrid/msg/As.java src/bindings/java/org/simgrid/msg/Comm.java src/bindings/java/org/simgrid/msg/File.java src/bindings/java/org/simgrid/msg/Host.java @@ -428,11 +517,15 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/ProcessKilledError.java src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java src/bindings/java/org/simgrid/msg/RngStream.java + src/bindings/java/org/simgrid/msg/Semaphore.java + src/bindings/java/org/simgrid/msg/Storage.java + src/bindings/java/org/simgrid/msg/StorageNotFoundException.java src/bindings/java/org/simgrid/msg/Task.java src/bindings/java/org/simgrid/msg/TaskCancelledException.java src/bindings/java/org/simgrid/msg/TimeoutException.java src/bindings/java/org/simgrid/msg/TransferFailureException.java src/bindings/java/org/simgrid/msg/VM.java + ${JSURF_JAVA_GENERATED_SRC} ) set(JTRACE_C_SRC @@ -464,15 +557,17 @@ set(LUA_SRC ) set(TRACING_SRC + src/instr/instr_TI_trace.c src/instr/instr_config.c src/instr/instr_interface.c src/instr/instr_paje_containers.c - src/instr/instr_paje_trace.c src/instr/instr_paje_header.c + src/instr/instr_paje_trace.c src/instr/instr_paje_types.c src/instr/instr_paje_values.c src/instr/instr_private.h src/instr/instr_resource_utilization.c + src/instr/instr_trace.c ) set(JEDULE_SRC @@ -488,16 +583,32 @@ set(JEDULE_SRC set(MC_SRC src/mc/mc_checkpoint.c - src/mc/mc_compare.c - src/mc/mc_dpor.c + src/mc/mc_snapshot.c + src/mc/mc_page_store.cpp + src/mc/mc_page_snapshot.cpp + src/mc/mc_comm_determinism.c + src/mc/mc_compare.cpp + src/mc/mc_config.c + src/mc/mc_diff.c + src/mc/mc_dwarf.c + src/mc/mc_dwarf_attrnames.h + src/mc/mc_dwarf_expression.c + src/mc/mc_dwarf_tagnames.h src/mc/mc_global.c + src/mc/mc_hash.c + src/mc/mc_ignore.c + src/mc/mc_interface.h src/mc/mc_liveness.c + src/mc/mc_member.c src/mc/mc_memory.c + src/mc/mc_pair.c src/mc/mc_private.h src/mc/mc_request.c + src/mc/mc_safety.c + src/mc/mc_set.cpp src/mc/mc_state.c + src/mc/mc_visited.c src/mc/memory_map.c - src/mc/mc_pair.c ) set(headers_to_install @@ -506,12 +617,14 @@ set(headers_to_install include/msg/msg.h include/simdag/datatypes.h include/simdag/simdag.h + include/simgrid.h + include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/platf.h include/simgrid/platf_generator.h + include/simgrid/plugins.h include/simgrid/simix.h include/smpi/mpi.h - include/smpi/mpif.h include/smpi/smpi.h include/smpi/smpi_cocci.h include/smpi/smpi_main.h @@ -528,7 +641,6 @@ set(headers_to_install include/xbt/dynar.h include/xbt/ex.h include/xbt/fifo.h - include/xbt/file_stat.h include/xbt/function_types.h include/xbt/graph.h include/xbt/graphxml.h @@ -555,10 +667,11 @@ set(headers_to_install include/xbt/sysdep.h 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/smpi/smpif.h.in + include/smpi/mpif.h.in src/context_sysv_config.h.in) ### depend of some variables setted upper @@ -611,7 +724,6 @@ set(simgrid_sources ${SIMGRID_SRC} ${SIMIX_SRC} ${SURF_SRC} - ${TRACING_SRC} ${XBT_SRC} ) @@ -683,12 +795,15 @@ else() endif() set(DOC_SOURCES - doc/AS_hierarchy.png 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 @@ -698,7 +813,6 @@ set(DOC_SOURCES doc/HelloWorld/CMakeLists.txt doc/HelloWorld/HelloWorld.c - doc/HelloWorld/FindPcreWin.cmake doc/HelloWorld/README doc/doxygen/FAQ.doc @@ -722,8 +836,8 @@ set(DOC_SOURCES doc/doxygen/module-msg.doc doc/doxygen/module-sd.doc doc/doxygen/module-simix.doc - doc/doxygen/module-surf.doc doc/doxygen/module-smpi.doc + doc/doxygen/module-surf.doc doc/doxygen/module-trace.doc doc/doxygen/module-xbt.doc doc/doxygen/modules.doc @@ -734,6 +848,12 @@ set(DOC_SOURCES doc/doxygen/tracing.doc doc/doxygen/use.doc + doc/manpage/smpicc.1 + doc/manpage/smpicxx.1 + doc/manpage/smpif90.1 + doc/manpage/smpiff.1 + doc/manpage/smpirun.1 + doc/msg-tuto-src/deployment0.xml doc/msg-tuto-src/deployment1.xml doc/msg-tuto-src/deployment2.xml @@ -749,6 +869,8 @@ set(DOC_SOURCES doc/msg-tuto-src/platforms/griffon.xml doc/msg-tuto-src/platforms/peers.xml doc/msg-tuto-src/platforms/platform.xml + + CITATION.bib ) set(DOC_FIGS @@ -766,6 +888,7 @@ set(DOC_TOOLS set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.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 @@ -785,15 +908,18 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png + ${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 ${bin_files} src/smpi/smpicc.in - src/smpi/smpif2c.in + src/smpi/smpicxx.in src/smpi/smpiff.in src/smpi/smpif90.in src/smpi/smpirun.in + src/smpi/smpitools.sh ) set(txt_files @@ -817,6 +943,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/bittorrent/CMakeLists.txt examples/java/chord/CMakeLists.txt examples/java/cloud/CMakeLists.txt + examples/java/cloud/migration/CMakeLists.txt examples/java/commTime/CMakeLists.txt examples/java/io/CMakeLists.txt examples/java/kademlia/CMakeLists.txt @@ -827,15 +954,23 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/mutualExclusion/CMakeLists.txt examples/java/pingPong/CMakeLists.txt examples/java/priority/CMakeLists.txt + examples/java/reservationSurfPlugin/CMakeLists.txt examples/java/startKillTime/CMakeLists.txt + examples/java/surfCpuModel/CMakeLists.txt + examples/java/surfPlugin/CMakeLists.txt examples/java/suspend/CMakeLists.txt examples/java/tracing/CMakeLists.txt examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt examples/msg/bittorrent/CMakeLists.txt + examples/msg/chainsend/CMakeLists.txt examples/msg/chord/CMakeLists.txt examples/msg/cloud/CMakeLists.txt + examples/msg/energy/e1/CMakeLists.txt + examples/msg/energy/e2/CMakeLists.txt + examples/msg/energy/e3/CMakeLists.txt + examples/msg/exception/CMakeLists.txt examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt @@ -846,46 +981,128 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/migration/CMakeLists.txt examples/msg/ns3/CMakeLists.txt examples/msg/parallel_task/CMakeLists.txt + examples/msg/pastry/CMakeLists.txt examples/msg/pmm/CMakeLists.txt examples/msg/priority/CMakeLists.txt examples/msg/properties/CMakeLists.txt + examples/msg/semaphores/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt - examples/msg/chainsend/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt examples/msg/tracing/CMakeLists.txt + examples/scala/CMakeLists.txt + examples/scala/master_slave_bypass/CMakeLists.txt + examples/scala/master_slave_kill/CMakeLists.txt + examples/scala/masterslave/CMakeLists.txt examples/simdag/CMakeLists.txt examples/simdag/dax/CMakeLists.txt examples/simdag/dot/CMakeLists.txt examples/simdag/goal/CMakeLists.txt + examples/simdag/io/CMakeLists.txt examples/simdag/metaxml/CMakeLists.txt examples/simdag/properties/CMakeLists.txt examples/simdag/scheduling/CMakeLists.txt examples/smpi/CMakeLists.txt + examples/smpi/smpi_msg_masterslave/CMakeLists.txt + examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/MM/CMakeLists.txt + examples/smpi/energy/CMakeLists.txt + examples/smpi/energy/f77/CMakeLists.txt + examples/smpi/energy/f90/CMakeLists.txt examples/xbt/CMakeLists.txt ) set(TESHSUITE_CMAKEFILES_TXT - teshsuite/CMakeLists.txt + teshsuite/bug-17132/CMakeLists.txt + teshsuite/java/CMakeLists.txt + teshsuite/java/sleep_host_off/CMakeLists.txt + teshsuite/mc/CMakeLists.txt + teshsuite/mc/dwarf/CMakeLists.txt + teshsuite/mc/dwarf_expression/CMakeLists.txt teshsuite/msg/CMakeLists.txt + teshsuite/msg/get_sender/CMakeLists.txt + teshsuite/msg/host_on_off/CMakeLists.txt + teshsuite/msg/host_on_off_processes/CMakeLists.txt + teshsuite/msg/pid/CMakeLists.txt + teshsuite/msg/process/CMakeLists.txt + teshsuite/msg/process_join/CMakeLists.txt + teshsuite/msg/storage/CMakeLists.txt + teshsuite/msg/task_destroy_cancel/CMakeLists.txt teshsuite/msg/trace/CMakeLists.txt - teshsuite/simdag/CMakeLists.txt + teshsuite/simdag/availability/CMakeLists.txt + teshsuite/simdag/basic/CMakeLists.txt + teshsuite/simdag/incomplete/CMakeLists.txt teshsuite/simdag/network/CMakeLists.txt teshsuite/simdag/network/mxn/CMakeLists.txt teshsuite/simdag/network/p2p/CMakeLists.txt teshsuite/simdag/partask/CMakeLists.txt teshsuite/simdag/platforms/CMakeLists.txt - teshsuite/simdag/availability/CMakeLists.txt - teshsuite/xbt/CMakeLists.txt + teshsuite/simix/check_defaults/CMakeLists.txt + teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/mpich-test/CMakeLists.txt - teshsuite/smpi/mpich-test/env/CMakeLists.txt - teshsuite/smpi/mpich-test/coll/CMakeLists.txt - teshsuite/smpi/mpich-test/context/CMakeLists.txt - teshsuite/smpi/mpich-test/profile/CMakeLists.txt - teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt + teshsuite/smpi/allgather/CMakeLists.txt + teshsuite/smpi/allgatherv/CMakeLists.txt + teshsuite/smpi/allreduce/CMakeLists.txt + teshsuite/smpi/alltoall/CMakeLists.txt + teshsuite/smpi/alltoallv/CMakeLists.txt + teshsuite/smpi/barrier/CMakeLists.txt + teshsuite/smpi/bcast/CMakeLists.txt + teshsuite/smpi/compute/CMakeLists.txt + teshsuite/smpi/gather/CMakeLists.txt + teshsuite/smpi/hvector/CMakeLists.txt + teshsuite/smpi/indexed/CMakeLists.txt + teshsuite/smpi/pingpong/CMakeLists.txt + teshsuite/smpi/reduce/CMakeLists.txt + teshsuite/smpi/scatter/CMakeLists.txt + teshsuite/smpi/shared/CMakeLists.txt + teshsuite/smpi/struct/CMakeLists.txt + teshsuite/smpi/vector/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/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt + teshsuite/smpi/mpich3-test/group/CMakeLists.txt + teshsuite/smpi/mpich3-test/info/CMakeLists.txt + teshsuite/smpi/mpich3-test/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/topo/CMakeLists.txt + teshsuite/smpi/mpich3-test/rma/CMakeLists.txt + teshsuite/smpi/mpich3-test/perf/CMakeLists.txt + teshsuite/surf/CMakeLists.txt + teshsuite/surf/lmm_usage/CMakeLists.txt + teshsuite/surf/maxmin_bench/CMakeLists.txt + teshsuite/surf/surf_usage/CMakeLists.txt + teshsuite/surf/trace_usage/CMakeLists.txt + teshsuite/xbt/graphxml_usage/CMakeLists.txt + teshsuite/xbt/heap_bench/CMakeLists.txt + teshsuite/xbt/log_large/CMakeLists.txt + teshsuite/xbt/log_usage/CMakeLists.txt + teshsuite/xbt/mallocator/CMakeLists.txt + teshsuite/xbt/mmalloc/CMakeLists.txt + teshsuite/xbt/parallel_log/CMakeLists.txt + teshsuite/xbt/parmap_bench/CMakeLists.txt + teshsuite/xbt/parmap_test/CMakeLists.txt ) set(TOOLS_CMAKEFILES_TXT @@ -894,11 +1111,6 @@ set(TOOLS_CMAKEFILES_TXT tools/tesh/CMakeLists.txt ) -set(TESTSUITE_CMAKEFILES_TXT - testsuite/surf/CMakeLists.txt - testsuite/xbt/CMakeLists.txt - ) - set(CMAKE_SOURCE_FILES CMakeLists.txt buildtools/Cmake/AddTests.cmake @@ -915,16 +1127,17 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/MakeJava.cmake buildtools/Cmake/MakeLib.cmake buildtools/Cmake/MakeLibWin.cmake - buildtools/Cmake/Modules/FindF2c.cmake + buildtools/Cmake/Modules/FindGFortran.cmake buildtools/Cmake/Modules/FindGTnets.cmake buildtools/Cmake/Modules/FindGraphviz.cmake + buildtools/Cmake/Modules/FindLibSigc++.cmake + buildtools/Cmake/Modules/FindLibdw.cmake buildtools/Cmake/Modules/FindLibunwind.cmake buildtools/Cmake/Modules/FindLua51Simgrid.cmake buildtools/Cmake/Modules/FindNS3.cmake - buildtools/Cmake/Modules/FindPCRE.cmake - buildtools/Cmake/Modules/FindPcreWin.cmake buildtools/Cmake/Modules/FindRngStream.cmake buildtools/Cmake/Modules/FindRubySimgrid.cmake + buildtools/Cmake/Modules/FindScala.cmake buildtools/Cmake/Modules/FindSimGrid.cmake buildtools/Cmake/Modules/FindValgrind.cmake buildtools/Cmake/Option.cmake @@ -934,13 +1147,12 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/Makefile.default buildtools/Cmake/Scripts/SimGrid.packproj buildtools/Cmake/Scripts/generate_memcheck_tests.pl - buildtools/Cmake/Scripts/generate_new_tests.pl + buildtools/Cmake/Scripts/java_bundle.sh buildtools/Cmake/Scripts/my_valgrind.pl buildtools/Cmake/Scripts/postinstall.sh buildtools/Cmake/Scripts/preinstall.sh buildtools/Cmake/Scripts/tesh.pl buildtools/Cmake/Scripts/update_tesh.pl - buildtools/Cmake/Supernovae.cmake buildtools/Cmake/UnitTesting.cmake buildtools/Cmake/src/internal_config.h.in buildtools/Cmake/src/simgrid.nsi.in @@ -957,6 +1169,12 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/test_prog/prog_stacksetup.c buildtools/Cmake/test_prog/prog_thread_storage.c buildtools/Cmake/test_prog/prog_vsnprintf.c + tools/stack-cleaner/as + tools/stack-cleaner/cc + tools/stack-cleaner/c++ + tools/stack-cleaner/fortran + tools/stack-cleaner/clean-stack-filter + tools/stack-cleaner/README ) set(PLATFORMS_EXAMPLES @@ -966,7 +1184,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster.xml examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_no_backbone.xml - examples/platforms/cluster_routing_rulebased.xml examples/platforms/clusters_routing_full.xml examples/platforms/conf/gridpp_grid_2004.conf examples/platforms/conf/gridpp_grid_2004.xml @@ -974,8 +1191,17 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/config_tracing.xml + examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt + examples/platforms/content/win_storage_content.txt + examples/platforms/trace/trace_A_failure.txt + examples/platforms/trace/trace_A.txt + examples/platforms/trace/trace_B.txt examples/platforms/data_center.xml + examples/platforms/deployment_remote_io.xml + examples/platforms/energy_platform.xml + examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml examples/platforms/generation_scripts/create_hierarchical_clusters.pl examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl @@ -984,9 +1210,16 @@ set(PLATFORMS_EXAMPLES examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml + examples/platforms/platform.xml examples/platforms/prop.xml + examples/platforms/remote_io.xml examples/platforms/routing_cluster.xml examples/platforms/storage.xml + examples/platforms/small_platform.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_with_routers.xml examples/platforms/syscoord/generate_peer_platform.pl examples/platforms/syscoord/median_harvard.syscoord examples/platforms/syscoord/median_harvard.xml @@ -994,6 +1227,11 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_meridian.xml examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/syscoord/median_p2psim.xml + examples/platforms/torus_cluster.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 examples/platforms/two_peers.xml examples/platforms/vivaldi.xml )