X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b5b78d30ccd8b5e3658ae83c51dd7501be7c9f48..3b53885f888f2539a533797e76a3f3ff84cdfe0c:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 75b1d8aaad..1dc9ef3ca1 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -6,7 +6,7 @@ set(EXTRA_DIST src/include/mc/datatypes.h src/include/mc/mc.h src/mc/mc_mmu.h - src/mc/mc_page_store.h + src/mc/PageStore.hpp src/mc/mc_record.h src/include/simgrid/platf_interface.h src/include/simgrid/sg_config.h @@ -15,8 +15,6 @@ set(EXTRA_DIST src/include/surf/maxmin.h src/include/surf/random_mgr.h src/include/surf/surf.h - src/include/surf/surf_resource.h - 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 @@ -52,13 +50,9 @@ set(EXTRA_DIST 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.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 @@ -88,11 +82,11 @@ set(EXTRA_DIST 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/surf/vm_hl13.hpp + src/surf/vm_interface.hpp + src/surf/host_clm03.hpp + src/surf/host_interface.hpp + src/surf/host_ptask_L07.hpp src/win32/config.h src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.lex @@ -126,10 +120,9 @@ set(EXTRA_DIST src/xbt/probes.h src/xbt/setset_private.h src/xbt/win32_ucontext.c - tools/tesh/run_context.h - tools/tesh/tesh.h tools/tesh/generate_tesh examples/smpi/mc/only_send_deterministic.tesh + examples/smpi/mc/non_deterministic.tesh ) set(SMPI_SRC @@ -302,13 +295,6 @@ if(HAVE_MMALLOC) ) endif() -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.cpp - ) - set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/my-point-to-point-helper.cc @@ -352,11 +338,11 @@ set(SURF_SRC src/surf/surfxml_parse.c src/surf/surfxml_parseplatf.c src/surf/trace_mgr.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/surf/vm_hl13.cpp + src/surf/vm_interface.cpp + src/surf/host_clm03.cpp + src/surf/host_interface.cpp + src/surf/host_ptask_L07.cpp src/xbt/xbt_sg_stubs.c ) @@ -378,11 +364,31 @@ set(SIMIX_SRC src/simix/smx_synchro.c src/simix/smx_vm.c src/simix/popping.c + ${SIMIX_GENERATED_SRC} ) +if (HAVE_BOOST_CONTEXT) + set(SIMIX_SRC + ${SIMIX_SRC} + src/simix/smx_context_boost.cpp) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + src/simix/smx_context_boost.cpp) +endif() + +set(S4U_SRC + src/s4u/s4u_channel.cpp + src/s4u/s4u_engine.cpp + src/s4u/s4u_host.cpp + src/s4u/s4u_process.cpp +) + set(SIMGRID_SRC src/simgrid/sg_config.c + src/simgrid/host.cpp + src/simgrid/util.hpp ) set(MSG_SRC @@ -453,7 +459,7 @@ set(JSURF_JAVA_GENERATED_SRC 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/Link.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 @@ -497,8 +503,8 @@ set(JMSG_C_SRC ) set(JSURF_C_SRC - src/bindings/java/surfJAVA_wrap.cxx - src/bindings/java/surfJAVA_wrap.h + src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx + src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h ${JSURF_JAVA_C_SRC} ) @@ -579,56 +585,93 @@ set(JEDULE_SRC ) set(MC_SRC_BASE - src/mc/mc_base.c + src/mc/mc_base.cpp src/mc/mc_base.h src/mc/mc_record.h - src/mc/mc_record.c - src/mc/mc_config.c - src/mc/mc_global.c + src/mc/mc_replay.h + src/mc/mc_record.cpp + src/mc/mc_config.cpp + src/mc/mc_global.cpp ) set(MC_SRC + src/mc/AddressSpace.hpp + src/mc/AddressSpace.cpp + src/mc/Frame.hpp + src/mc/ModelChecker.hpp + src/mc/ModelChecker.cpp + src/mc/ObjectInformation.hpp + src/mc/ObjectInformation.cpp + src/mc/PageStore.hpp + src/mc/PageStore.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.h + src/mc/mc_forward.hpp + src/mc/mc_process.h + src/mc/mc_process.cpp + src/mc/mc_unw.h + src/mc/mc_unw.cpp + src/mc/mc_unw_vmread.cpp src/mc/mc_mmalloc.h - src/mc/mc_model_checker.h src/mc/mc_object_info.h - src/mc/mc_checkpoint.c + src/mc/mc_checkpoint.cpp src/mc/mc_snapshot.h - src/mc/mc_snapshot.c - src/mc/mc_page_store.h - src/mc/mc_page_store.cpp + src/mc/mc_snapshot.cpp src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.h - src/mc/mc_comm_determinism.c + src/mc/mc_comm_pattern.cpp + src/mc/mc_comm_determinism.cpp src/mc/mc_compare.cpp - 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_hash.c - src/mc/mc_ignore.c - src/mc/mc_interface.h + src/mc/mc_diff.cpp + src/mc/mc_dwarf.cpp + src/mc/mc_dwarf_attrnames.cpp + src/mc/mc_dwarf_expression.cpp + src/mc/mc_dwarf_tagnames.cpp + src/mc/mc_hash.hpp + src/mc/mc_hash.cpp + src/mc/mc_ignore.cpp + src/mc/mcer_ignore.cpp + src/mc/mcer_ignore.h + src/mc/mc_ignore.h src/mc/mc_liveness.h src/mc/mc_location.h - src/mc/mc_liveness.c - src/mc/mc_record.c - src/mc/mc_member.c - src/mc/mc_memory.c - src/mc/mc_pair.c + src/mc/mc_liveness.cpp + src/mc/mc_record.cpp + src/mc/mc_member.cpp + src/mc/mc_memory.cpp + src/mc/mc_pair.cpp src/mc/mc_private.h src/mc/mc_request.h - src/mc/mc_request.c + src/mc/mc_request.cpp src/mc/mc_safety.h - src/mc/mc_safety.c - src/mc/mc_set.cpp + src/mc/mc_safety.cpp src/mc/mc_state.h - src/mc/mc_state.c - src/mc/mc_visited.c + src/mc/mc_state.cpp + src/mc/mc_visited.cpp src/mc/mc_memory_map.h - src/mc/memory_map.c + src/mc/memory_map.cpp + src/mc/mc_client.cpp + src/mc/mc_client_api.cpp + src/mc/mc_client.h + src/mc/mc_protocol.h + src/mc/mc_protocol.cpp + src/mc/mc_server.cpp + src/mc/mc_server.h + src/mc/mc_smx.h + src/mc/mc_smx.cpp + src/mc/mc_xbt.hpp + src/mc/mc_xbt.cpp + src/mc/mc_exit.h ) +set(MC_SIMGRID_MC_SRC + src/mc/simgrid_mc.cpp) + set(headers_to_install include/msg/msg.h include/msg/datatypes.h @@ -645,6 +688,13 @@ set(headers_to_install include/simgrid/platf_generator.h include/simgrid/plugins.h include/simgrid/simix.h + include/simgrid/host.h + include/simgrid/link.h + include/simgrid/s4u/channel.hpp + include/simgrid/s4u/engine.hpp + include/simgrid/s4u/host.hpp + include/simgrid/s4u/process.hpp + include/simgrid/s4u.h include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_cocci.h @@ -656,6 +706,8 @@ set(headers_to_install include/xbt/RngStream.h include/xbt/asserts.h include/xbt/automaton.h + include/xbt/automaton.hpp + include/xbt/base.h include/xbt/config.h include/xbt/cunit.h include/xbt/dict.h @@ -723,23 +775,10 @@ else() # NOT ucontext ) endif() -# -->HAVE_GTNETS -if(HAVE_GTNETS) - set(GTNETS_USED - ${GTNETS_SRC} - ) -else() - set(GTNETS_USED "") - set(EXTRA_DIST - ${EXTRA_DIST} - ${GTNETS_SRC} - ) -endif() - ### Simgrid Lib sources set(simgrid_sources ${BINDINGS_SRC} - ${GTNETS_USED} + ${S4U_SRC} ${MSG_SRC} ${SIMDAG_SRC} ${SIMGRID_SRC} @@ -844,7 +883,7 @@ set(DOC_SOURCES doc/doxygen/header.html doc/doxygen/help.doc doc/doxygen/index.doc - doc/doxygen/inside_autotests.doc + doc/doxygen/inside_ci.doc doc/doxygen/inside_cmake.doc doc/doxygen/inside_doxygen.doc doc/doxygen/inside_extending.doc @@ -986,12 +1025,12 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/chainsend/CMakeLists.txt examples/msg/chord/CMakeLists.txt examples/msg/cloud/CMakeLists.txt + examples/msg/energy/consumption/CMakeLists.txt + examples/msg/energy/onoff/CMakeLists.txt examples/msg/energy/pstate/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/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt examples/msg/io/CMakeLists.txt examples/msg/kademlia/CMakeLists.txt @@ -1010,6 +1049,8 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt examples/msg/tracing/CMakeLists.txt + examples/s4u/CMakeLists.txt + examples/s4u/dumb/CMakeLists.txt examples/scala/CMakeLists.txt examples/scala/master_slave_bypass/CMakeLists.txt examples/scala/master_slave_kill/CMakeLists.txt @@ -1148,7 +1189,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/MakeLib.cmake buildtools/Cmake/MakeLibWin.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 @@ -1171,16 +1211,13 @@ set(CMAKE_SOURCE_FILES 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/UnitTesting.cmake buildtools/Cmake/src/internal_config.h.in buildtools/Cmake/src/simgrid.nsi.in buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c buildtools/Cmake/test_prog/prog_gnu_dynlinker.c - buildtools/Cmake/test_prog/prog_gtnets.cpp buildtools/Cmake/test_prog/prog_mutex_timedlock.c - buildtools/Cmake/test_prog/prog_printf_null.c buildtools/Cmake/test_prog/prog_sem_init.c buildtools/Cmake/test_prog/prog_sem_open.c buildtools/Cmake/test_prog/prog_sem_timedwait.c @@ -1189,6 +1226,7 @@ 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 + buildtools/Cross/Mingw.cmake tools/stack-cleaner/as tools/stack-cleaner/cc tools/stack-cleaner/c++ @@ -1206,6 +1244,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_no_backbone.xml examples/platforms/clusters_routing_full.xml + examples/platforms/crosstraffic.xml examples/platforms/conf/gridpp_grid_2004.conf examples/platforms/conf/gridpp_grid_2004.xml examples/platforms/conf/lcg_sept2004_grid.conf @@ -1213,14 +1252,10 @@ set(PLATFORMS_EXAMPLES 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 @@ -1233,9 +1268,13 @@ set(PLATFORMS_EXAMPLES 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/storage/content/small_content.txt + examples/platforms/storage/content/storage_content.txt + examples/platforms/storage/content/win_storage_content.txt + examples/platforms/storage/remote_io.deployment.xml + examples/platforms/storage/remote_io.xml + examples/platforms/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform_fatpipe.xml examples/platforms/small_platform_one_link_routes.xml