X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..027295612d642dab025657808b3ab22304644aae:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 940acdb8d7..0f5270f61e 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1,8 +1,7 @@ ### 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 @@ -17,9 +16,9 @@ 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,6 +26,14 @@ 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/simcalls_generated_enum.h + src/simix/simcalls_generated_string.c + src/simix/simcalls_generated_res_getter_setter.h + src/simix/simcalls_generated_args_getter_setter.h + src/simix/simcalls_generated_case.c + src/simix/simcalls_generated_body.c src/simix/smx_host_private.h src/simix/smx_io_private.h src/simix/smx_network_private.h @@ -40,15 +47,20 @@ set(EXTRA_DIST src/smpi/colls/coll_tuned_topo.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h - src/surf/cpu_cas01_private.h - src/surf/cpu_ti_private.h + src/surf/plugins/energy.hpp + src/surf/cpu_interface.hpp + src/surf/cpu_ti.hpp + src/surf/cpu_cas01.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_interface.hpp + src/surf/network_gtnets.hpp + src/surf/network_ns3.hpp + src/surf/network_cm02.hpp + src/surf/network_smpi.hpp + src/surf/network_constant.hpp src/surf/ns3/my-point-to-point-helper.h src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h @@ -56,11 +68,27 @@ set(EXTRA_DIST src/surf/platf_generator_private.h 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_private.hpp + src/surf/surf_routing.hpp + src/surf/surf_routing_cluster.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_vivaldi.hpp src/surf/surfxml_parse.c src/surf/trace_mgr_private.h + src/surf/vm_workstation_interface.hpp + src/surf/vm_workstation_hl13.hpp + src/surf/workstation_interface.hpp + src/surf/workstation_clm03.hpp + src/surf/workstation_ptask_L07.hpp src/win32/config.h src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.lex @@ -96,21 +124,25 @@ set(EXTRA_DIST src/xbt/win32_ucontext.c tools/tesh/run_context.h tools/tesh/tesh.h + src/surf/surf_routing_cluster_fat_tree.hpp ) set(SMPI_SRC + src/surf/surf_routing_cluster_fat_tree.cpp 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_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_topo.c src/smpi/colls/smpi_openmpi_selector.c src/smpi/colls/smpi_mpich_selector.c src/smpi/colls/colls_global.c @@ -129,7 +161,7 @@ set(SMPI_SRC src/smpi/colls/allgather-smp-simple.c src/smpi/colls/allgather-spreading-simple.c src/smpi/colls/allgather-ompi-neighborexchange.c - src/smpi/colls/allgatherv-GB.c + src/smpi/colls/allgatherv-GB.c src/smpi/colls/allgatherv-pair.c src/smpi/colls/allgatherv-ring.c src/smpi/colls/allgatherv-ompi-neighborexchange.c @@ -161,10 +193,10 @@ set(SMPI_SRC 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/alltoallv-pair.c + src/smpi/colls/alltoallv-pair.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-one-barrier.c src/smpi/colls/alltoallv-ring.c src/smpi/colls/alltoallv-ring-light-barrier.c src/smpi/colls/alltoallv-ring-mpi-barrier.c @@ -256,7 +288,7 @@ set(XBT_SRC src/xbt_modinter.h ) -if(HAVE_MMAP) +if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c @@ -267,11 +299,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 @@ -279,35 +311,43 @@ set(NS3_SRC ) set(SURF_SRC - src/surf/cpu_cas01.c - src/surf/cpu_ti.c - src/surf/fair_bottleneck.c + src/surf/plugins/energy.cpp + src/surf/cpu_interface.cpp + src/surf/cpu_ti.cpp + src/surf/cpu_cas01.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_interface.cpp + src/surf/network_cm02.cpp + src/surf/network_smpi.cpp + src/surf/network_constant.cpp src/surf/platf_generator.c 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_vivaldi.c + src/surf/storage_interface.cpp + src/surf/storage_n11.cpp + src/surf/surf_interface.cpp + src/surf/surf_c_bindings.cpp + src/surf/surf_routing.cpp + src/surf/surf_routing_cluster.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/workstation_interface.cpp + src/surf/workstation_clm03.cpp + src/surf/workstation_ptask_L07.cpp + src/surf/vm_workstation_interface.cpp + src/surf/vm_workstation_hl13.cpp src/xbt/xbt_sg_stubs.c ) @@ -325,6 +365,7 @@ set(SIMIX_SRC src/simix/smx_smurf.c src/simix/smx_synchro.c src/simix/smx_user.c + src/simix/smx_vm.c ) set(SIMGRID_SRC @@ -366,19 +407,6 @@ set(SIMIX_SRC ) #* ****************************************************************************************** *# -#* ****************************************************************************************** *# -#* 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 @@ -405,6 +433,47 @@ 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/Surf.java + src/bindings/java/org/simgrid/surf/SurfJNI.java + src/bindings/java/org/simgrid/surf/Plugin.java + src/bindings/java/org/simgrid/surf/Model.java + src/bindings/java/org/simgrid/surf/CpuModel.java + src/bindings/java/org/simgrid/surf/Resource.java + src/bindings/java/org/simgrid/surf/Action.java + src/bindings/java/org/simgrid/surf/Cpu.java + src/bindings/java/org/simgrid/surf/CpuAction.java + src/bindings/java/org/simgrid/surf/NetworkLink.java + src/bindings/java/org/simgrid/surf/NetworkAction.java + + src/bindings/java/org/simgrid/surf/RoutingEdge.java + src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java + src/bindings/java/org/simgrid/surf/TmgrTrace.java + + src/bindings/java/org/simgrid/surf/ActionList.java + + #enums + src/bindings/java/org/simgrid/surf/ActionState.java + src/bindings/java/org/simgrid/surf/ResourceState.java + + src/bindings/java/org/simgrid/surf/LmmConstraint.java + src/bindings/java/org/simgrid/surf/LmmVariable.java + src/bindings/java/org/simgrid/surf/XbtDict.java +) + set(JMSG_C_SRC src/bindings/java/jmsg.c src/bindings/java/jmsg.h @@ -434,8 +503,16 @@ set(JMSG_C_SRC src/bindings/java/smx_context_java.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 @@ -445,17 +522,18 @@ 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/Semaphore.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 src/bindings/java/org/simgrid/msg/RngStream.java + src/bindings/java/org/simgrid/msg/Semaphore.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 @@ -490,7 +568,9 @@ set(TRACING_SRC src/instr/instr_config.c src/instr/instr_interface.c src/instr/instr_paje_containers.c + src/instr/instr_TI_trace.c src/instr/instr_paje_trace.c + src/instr/instr_trace.c src/instr/instr_paje_header.c src/instr/instr_paje_types.c src/instr/instr_paje_values.c @@ -514,6 +594,11 @@ set(MC_SRC src/mc/mc_compare.c src/mc/mc_dpor.c src/mc/mc_global.c + src/mc/mc_dwarf.c + src/mc/mc_member.c + src/mc/mc_dwarf_attrnames.h + src/mc/mc_dwarf_expression.c + src/mc/mc_dwarf_tagnames.h src/mc/mc_liveness.c src/mc/mc_memory.c src/mc/mc_private.h @@ -521,20 +606,24 @@ set(MC_SRC src/mc/mc_state.c src/mc/memory_map.c src/mc/mc_pair.c + src/mc/mc_hash.c + src/mc/mc_set.cpp ) set(headers_to_install + include/simgrid.h include/instr/instr.h include/msg/datatypes.h include/msg/msg.h include/simdag/datatypes.h include/simdag/simdag.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 @@ -580,6 +669,7 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid_config.h.in + include/smpi/mpif.h.in include/smpi/smpif.h.in src/context_sysv_config.h.in) @@ -768,7 +858,7 @@ 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 ) @@ -818,6 +908,7 @@ set(bin_files src/smpi/smpiff.in src/smpi/smpif90.in src/smpi/smpirun.in + src/smpi/smpitools.sh ) set(txt_files @@ -841,6 +932,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 @@ -851,7 +943,10 @@ 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 @@ -898,13 +993,18 @@ set(EXAMPLES_CMAKEFILES_TXT examples/simdag/scheduling/CMakeLists.txt examples/smpi/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/msg/CMakeLists.txt + teshsuite/msg/process_join/CMakeLists.txt + teshsuite/msg/storage/CMakeLists.txt teshsuite/msg/trace/CMakeLists.txt + teshsuite/bug-17132/CMakeLists.txt teshsuite/simdag/CMakeLists.txt teshsuite/simdag/availability/CMakeLists.txt teshsuite/simdag/network/CMakeLists.txt @@ -912,6 +1012,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/simdag/network/p2p/CMakeLists.txt teshsuite/simdag/partask/CMakeLists.txt teshsuite/simdag/platforms/CMakeLists.txt + teshsuite/simix/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -919,8 +1020,10 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/smpi/mpich3-test/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt teshsuite/smpi/mpich3-test/group/CMakeLists.txt + teshsuite/smpi/mpich3-test/topo/CMakeLists.txt teshsuite/smpi/mpich3-test/init/CMakeLists.txt teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt # teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -928,6 +1031,7 @@ set(TESHSUITE_CMAKEFILES_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/f90/util/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -944,6 +1048,7 @@ set(TOOLS_CMAKEFILES_TXT set(TESTSUITE_CMAKEFILES_TXT testsuite/surf/CMakeLists.txt testsuite/xbt/CMakeLists.txt + testsuite/mc/CMakeLists.txt ) set(CMAKE_SOURCE_FILES @@ -963,9 +1068,12 @@ set(CMAKE_SOURCE_FILES 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/FindLibunwind.cmake + buildtools/Cmake/Modules/FindLibdw.cmake buildtools/Cmake/Modules/FindLua51Simgrid.cmake buildtools/Cmake/Modules/FindNS3.cmake buildtools/Cmake/Modules/FindRngStream.cmake @@ -981,12 +1089,12 @@ set(CMAKE_SOURCE_FILES 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 @@ -1019,6 +1127,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt examples/platforms/content/win_storage_content.txt examples/platforms/data_center.xml @@ -1028,6 +1137,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/generation_scripts/generate_g5k_platform.pl examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl examples/platforms/griffon.xml + examples/platforms/torus_cluster.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/prop.xml