X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f7e9a5afbeed8d2a18f3f52390da42856366eb7..15479dbe435febdbec7411e8de9b11bac1ca9350:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 04c57b0169..6b18fd179c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -48,6 +48,7 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp + src/surf/disk_s19.hpp src/surf/StorageImpl.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp @@ -66,7 +67,6 @@ set(EXTRA_DIST src/xbt/mallocator_private.h src/xbt/mmalloc/mfree.c - src/xbt/mmalloc/mm.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c src/xbt/mmalloc/mmalloc.c @@ -88,6 +88,56 @@ set(EXTRA_DIST ) set(SMPI_SRC + src/smpi/internals/instr_smpi.cpp + src/smpi/internals/smpi_bench.cpp + src/smpi/internals/smpi_memory.cpp + src/smpi/internals/smpi_shared.cpp + src/smpi/internals/smpi_deployment.cpp + src/smpi/internals/smpi_global.cpp + src/smpi/internals/smpi_host.cpp + src/smpi/internals/smpi_replay.cpp + src/smpi/internals/smpi_actor.cpp + src/smpi/internals/smpi_utils.cpp + src/smpi/mpi/smpi_comm.cpp + src/smpi/mpi/smpi_datatype.cpp + src/smpi/mpi/smpi_datatype_derived.cpp + src/smpi/mpi/smpi_errhandler.cpp + src/smpi/mpi/smpi_f2c.cpp + src/smpi/mpi/smpi_file.cpp + src/smpi/mpi/smpi_group.cpp + src/smpi/mpi/smpi_info.cpp + src/smpi/mpi/smpi_keyvals.cpp + src/smpi/mpi/smpi_op.cpp + src/smpi/mpi/smpi_request.cpp + src/smpi/mpi/smpi_status.cpp + src/smpi/mpi/smpi_topo.cpp + src/smpi/mpi/smpi_win.cpp + src/smpi/include/smpi_actor.hpp + src/smpi/include/smpi_coll.hpp + src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_datatype_derived.hpp + src/smpi/include/smpi_datatype.hpp + src/smpi/include/smpi_errhandler.hpp + src/smpi/include/smpi_f2c.hpp + src/smpi/include/smpi_file.hpp + src/smpi/include/smpi_group.hpp + src/smpi/include/smpi_host.hpp + src/smpi/include/smpi_info.hpp + src/smpi/include/smpi_keyvals.hpp + src/smpi/include/smpi_op.hpp + src/smpi/include/smpi_request.hpp + src/smpi/include/smpi_status.hpp + src/smpi/include/smpi_topo.hpp + src/smpi/include/smpi_win.hpp + src/smpi/plugins/sampi_loadbalancer.cpp + src/smpi/plugins/ampi/ampi.cpp + src/smpi/plugins/ampi/ampi.hpp + src/smpi/plugins/ampi/instr_ampi.cpp + src/smpi/plugins/ampi/instr_ampi.hpp + src/smpi/plugins/load_balancer/LoadBalancer.cpp + src/smpi/plugins/load_balancer/load_balancer.hpp + src/surf/network_smpi.cpp + src/surf/network_ib.cpp src/smpi/bindings/smpi_mpi.cpp src/smpi/bindings/smpi_pmpi.cpp src/smpi/bindings/smpi_pmpi_coll.cpp @@ -212,55 +262,6 @@ set(SMPI_SRC src/smpi/colls/smpi_openmpi_selector.cpp src/smpi/colls/smpi_mvapich2_selector.cpp src/smpi/colls/smpi_coll.cpp - src/smpi/internals/instr_smpi.cpp - src/smpi/internals/smpi_bench.cpp - src/smpi/internals/smpi_memory.cpp - src/smpi/internals/smpi_shared.cpp - src/smpi/internals/smpi_deployment.cpp - src/smpi/internals/smpi_dvfs.cpp - src/smpi/internals/smpi_global.cpp - src/smpi/internals/smpi_host.cpp - src/smpi/internals/smpi_replay.cpp - src/smpi/internals/smpi_actor.cpp - src/smpi/internals/smpi_utils.cpp - src/smpi/mpi/smpi_comm.cpp - src/smpi/mpi/smpi_datatype.cpp - src/smpi/mpi/smpi_datatype_derived.cpp - src/smpi/mpi/smpi_f2c.cpp - src/smpi/mpi/smpi_file.cpp - src/smpi/mpi/smpi_group.cpp - src/smpi/mpi/smpi_info.cpp - src/smpi/mpi/smpi_keyvals.cpp - src/smpi/mpi/smpi_op.cpp - src/smpi/mpi/smpi_request.cpp - src/smpi/mpi/smpi_status.cpp - src/smpi/mpi/smpi_topo.cpp - src/smpi/mpi/smpi_win.cpp - src/smpi/include/smpi_actor.hpp - src/smpi/include/smpi_coll.hpp - src/smpi/include/smpi_comm.hpp - src/smpi/include/smpi_datatype_derived.hpp - src/smpi/include/smpi_datatype.hpp - src/smpi/include/smpi_f2c.hpp - src/smpi/include/smpi_file.hpp - src/smpi/include/smpi_group.hpp - src/smpi/include/smpi_host.hpp - src/smpi/include/smpi_info.hpp - src/smpi/include/smpi_keyvals.hpp - src/smpi/include/smpi_op.hpp - src/smpi/include/smpi_request.hpp - src/smpi/include/smpi_status.hpp - src/smpi/include/smpi_topo.hpp - src/smpi/include/smpi_win.hpp - src/smpi/plugins/sampi_loadbalancer.cpp - src/smpi/plugins/ampi/ampi.cpp - src/smpi/plugins/ampi/ampi.hpp - src/smpi/plugins/ampi/instr_ampi.cpp - src/smpi/plugins/ampi/instr_ampi.hpp - src/smpi/plugins/load_balancer/LoadBalancer.cpp - src/smpi/plugins/load_balancer/load_balancer.hpp - src/surf/network_smpi.cpp - src/surf/network_ib.cpp ) set(XBT_SRC @@ -298,6 +299,8 @@ set(XBT_SRC if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c ) +else() + set(EXTRA_DIST ${EXTRA_DIST} src/xbt/mmalloc/mm.c) endif() set(NS3_SRC src/surf/network_ns3.cpp @@ -311,6 +314,8 @@ set(SURF_SRC src/kernel/resource/Action.cpp src/kernel/resource/Model.cpp src/kernel/resource/Resource.cpp + src/kernel/resource/DiskImpl.cpp + src/kernel/resource/DiskImpl.hpp src/kernel/resource/profile/DatedValue.cpp src/kernel/resource/profile/DatedValue.hpp @@ -339,9 +344,8 @@ set(SURF_SRC src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp + src/surf/disk_s19.cpp src/surf/network_cm02.cpp - src/surf/link_wifi.cpp - src/surf/link_wifi.hpp src/surf/network_constant.cpp src/surf/network_interface.cpp src/surf/PropertyHolder.cpp @@ -438,6 +442,7 @@ set(S4U_SRC src/s4u/s4u_Barrier.cpp src/s4u/s4u_ConditionVariable.cpp src/s4u/s4u_Comm.cpp + src/s4u/s4u_Disk.cpp src/s4u/s4u_Engine.cpp src/s4u/s4u_Exec.cpp src/s4u/s4u_Host.cpp @@ -597,6 +602,7 @@ set(MC_SRC src/mc/checker/CommunicationDeterminismChecker.hpp src/mc/checker/SafetyChecker.cpp src/mc/checker/SafetyChecker.hpp + src/mc/checker/SimcallInspector.hpp src/mc/checker/LivenessChecker.cpp src/mc/checker/LivenessChecker.hpp @@ -695,6 +701,8 @@ set(headers_to_install include/simgrid/kernel/future.hpp include/simgrid/host.h include/simgrid/link.h + include/simgrid/cond.h + include/simgrid/mutex.h include/simgrid/semaphore.h include/simgrid/storage.h include/simgrid/vm.h @@ -704,6 +712,7 @@ set(headers_to_install include/simgrid/s4u/Barrier.hpp include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp + include/simgrid/s4u/Disk.hpp include/simgrid/s4u/Engine.hpp include/simgrid/s4u/Exec.hpp include/simgrid/s4u/Host.hpp @@ -868,15 +877,6 @@ set(DOC_SOURCES docs/source/conf.py docs/source/Doxyfile docs/source/_ext/hidden_code_block.py - docs/source/_ext/javasphinx-apidoc - docs/source/_ext/javasphinx/apidoc.py - docs/source/_ext/javasphinx/compiler.py - docs/source/_ext/javasphinx/domain.py - docs/source/_ext/javasphinx/extdoc.py - docs/source/_ext/javasphinx/formatter.py - docs/source/_ext/javasphinx/htmlrst.py - docs/source/_ext/javasphinx/__init__.py - docs/source/_ext/javasphinx/util.py docs/source/_templates/breadcrumbs.html docs/source/img/eclipseScreenShot.png @@ -994,8 +994,6 @@ set(CMAKEFILES_TXT examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt - examples/smpi/energy/f77/CMakeLists.txt - examples/smpi/energy/f90/CMakeLists.txt examples/python/CMakeLists.txt examples/deprecated/java/CMakeLists.txt examples/deprecated/msg/CMakeLists.txt @@ -1019,6 +1017,7 @@ set(CMAKEFILES_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/errhan/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 @@ -1138,6 +1137,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/faulty_host.xml examples/platforms/g5k.xml examples/platforms/griffon.xml + examples/platforms/hosts_with_disks.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/onelink.xml