X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74225b4ab9dc011bc2ce1021c460ecdced98b4dc..18449bfffced07ec0a49297f1eb76c4fe6792895:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1f1e27d24a..e5a6a85eab 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,12 +2,15 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
+  src/bindings/python/simgrid_python.cpp
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
   src/include/surf/surf.hpp
+  src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
   src/include/xbt/mmalloc.h
+  src/include/catch.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/msg/msg_private.hpp
@@ -22,16 +25,14 @@ set(EXTRA_DIST
   src/simix/popping_generated.cpp
   src/simix/popping_enum.h
   src/simix/popping_accessors.hpp
-  src/simix/smx_host_private.hpp
-  src/simix/smx_io_private.hpp
-  src/simix/smx_network_private.hpp
   src/simix/smx_private.hpp
-  src/simix/smx_synchro_private.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
   src/smpi/include/private.hpp
   src/smpi/include/smpi_utils.hpp
+  src/smpi/smpi_main.c
+  src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
   src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
@@ -42,9 +43,6 @@ set(EXTRA_DIST
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
   src/surf/ns3/ns3_simulator.hpp
-  src/surf/trace_mgr_test.cpp
-  src/mc/sosp/mc_snapshot_test.cpp
-  src/mc/sosp/PageStore_test.cpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
@@ -63,10 +61,8 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/parserPromela.tab.hacc
   src/xbt/automaton/parserPromela.yacc
-  src/xbt/backtrace_dummy.cpp
-  src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
-  src/xbt/log_private.h
+  src/xbt/log_private.hpp
   src/xbt/mallocator_private.h
 
   src/xbt/mmalloc/mfree.c
@@ -87,12 +83,11 @@ set(EXTRA_DIST
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
 
-  examples/java/.classpath
-  examples/java/.project
+  examples/deprecated/java/.classpath
+  examples/deprecated/java/.project
   )
 
 set(SMPI_SRC
-  src/smpi/smpi_main.c
   src/smpi/bindings/smpi_mpi.cpp
   src/smpi/bindings/smpi_pmpi.cpp
   src/smpi/bindings/smpi_pmpi_coll.cpp
@@ -208,6 +203,7 @@ set(SMPI_SRC
   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_nbc_impl.cpp
   src/smpi/colls/smpi_automatic_selector.cpp
   src/smpi/colls/smpi_default_selector.cpp
   src/smpi/colls/smpi_mpich_selector.cpp
@@ -271,23 +267,23 @@ set(XBT_SRC
   src/xbt/automaton/automatonparse_promela.c
   src/xbt/backtrace.cpp
   src/xbt/config.cpp
-  src/xbt/cunit.cpp
   src/xbt/dict.cpp
   src/xbt/dict_cursor.c
   src/xbt/dict_elm.c
   src/xbt/dynar.cpp
   src/xbt/exception.cpp
   src/xbt/graph.c
-  src/xbt/log.c
+  src/xbt/log.cpp
   src/xbt/mallocator.c
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
+  src/xbt/OsSemaphore.hpp
   src/xbt/parmap.cpp
   src/xbt/snprintf.c
   src/xbt/string.cpp
-  src/xbt/xbt_log_appender_file.c
-  src/xbt/xbt_log_layout_format.c
-  src/xbt/xbt_log_layout_simple.c
+  src/xbt/xbt_log_appender_file.cpp
+  src/xbt/xbt_log_layout_format.cpp
+  src/xbt/xbt_log_layout_simple.cpp
   src/xbt/xbt_main.cpp
   src/xbt/xbt_os_file.cpp
   src/xbt/xbt_os_synchro.cpp
@@ -314,6 +310,8 @@ set(SURF_SRC
   src/kernel/resource/Action.cpp
   src/kernel/resource/Model.cpp
   src/kernel/resource/Resource.cpp
+  src/kernel/resource/profile/trace_mgr.hpp
+  src/kernel/resource/profile/trace_mgr.cpp
 
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/DijkstraZone.cpp
@@ -347,8 +345,6 @@ set(SURF_SRC
   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/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
@@ -381,15 +377,13 @@ set(SIMIX_SRC
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
   src/kernel/context/ContextRaw.hpp
+  src/kernel/context/ContextSwapped.cpp
+  src/kernel/context/ContextSwapped.hpp
+  src/kernel/context/ContextThread.cpp
+  src/kernel/context/ContextThread.hpp
   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/ActorImpl.cpp
-  src/simix/ActorImpl.hpp
-  src/simix/smx_synchro.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
@@ -405,10 +399,14 @@ set(SIMIX_SRC
   src/kernel/activity/MailboxImpl.hpp
   src/kernel/activity/MutexImpl.cpp
   src/kernel/activity/MutexImpl.hpp
+  src/kernel/activity/SemaphoreImpl.cpp
+  src/kernel/activity/SemaphoreImpl.hpp
   src/kernel/activity/SleepImpl.cpp
   src/kernel/activity/SleepImpl.hpp
   src/kernel/activity/SynchroRaw.cpp
   src/kernel/activity/SynchroRaw.hpp
+  src/kernel/actor/ActorImpl.cpp
+  src/kernel/actor/ActorImpl.hpp
 
   ${SIMIX_GENERATED_SRC}
   )
@@ -445,17 +443,16 @@ set(S4U_SRC
 )
 
 set(SIMGRID_SRC
+  src/simgrid/Exception.cpp
   src/simgrid/sg_config.cpp
   src/simgrid/util.hpp
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_task.cpp
   src/msg/msg_global.cpp
-  src/msg/msg_gos.cpp
+  src/msg/msg_comm.cpp
   src/msg/msg_legacy.cpp
   src/msg/msg_process.cpp
-  src/msg/msg_synchro.cpp
   src/msg/msg_task.cpp
   )
 
@@ -540,7 +537,7 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 set(LUA_SRC
   src/bindings/lua/lua_host.cpp
   src/bindings/lua/lua_platf.cpp
-  src/bindings/lua/lua_debug.cpp
+  src/bindings/lua/lua_utils.cpp
   src/bindings/lua/simgrid_lua.cpp
   )
 
@@ -658,8 +655,6 @@ set(MC_SRC
   src/mc/mc_client_api.cpp
   src/mc/mc_smx.hpp
   src/mc/mc_smx.cpp
-  src/mc/mc_xbt.hpp
-  src/mc/mc_xbt.cpp
   src/mc/mc_exit.hpp
   src/mc/Transition.hpp
   )
@@ -692,6 +687,7 @@ set(headers_to_install
   include/simgrid/kernel/future.hpp
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/semaphore.h
   include/simgrid/storage.h
   include/simgrid/vm.h
   include/simgrid/zone.h
@@ -747,7 +743,6 @@ set(headers_to_install
   include/xbt/base.h
   include/xbt/config.h
   include/xbt/config.hpp
-  include/xbt/cunit.h
   include/xbt/dict.h
   include/xbt/dynar.h
   include/xbt/ex.h
@@ -774,32 +769,17 @@ set(headers_to_install
   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
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  src/internal_config.h.in
+  src/simgrid/version.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper
-# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
-                               src/kernel/context/ContextThread.hpp )
-endif()
-
-if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC    ${SURF_SRC}   src/xbt/xbt_os_thread.c)
-else() # NOT pthread
-  set(EXTRA_DIST  ${EXTRA_DIST} src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.hpp
+  set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
   set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp
@@ -839,16 +819,6 @@ if(SIMGRID_HAVE_NS3)
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
 endif()
 
-# WINDOWS
-if(WIN32)
-  set(simgrid_sources
-    ${simgrid_sources}
-    src/kernel/context/ContextThread.cpp
-    src/kernel/context/ContextThread.hpp
-    src/xbt/xbt_os_thread.c
-    )
-endif()
-
 if(SIMGRID_HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
@@ -860,15 +830,10 @@ set(DOC_SOURCES
   doc/Layout.xml
 
   doc/doxygen/FAQ.doc
-  doc/doxygen/community.doc
   doc/doxygen/deployment.doc
-  doc/doxygen/footer.html
-  doc/doxygen/header.html
-  doc/doxygen/index.doc
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
   doc/doxygen/inside_cmake.doc
-  doc/doxygen/inside_doxygen.doc
   doc/doxygen/inside_extending.doc
   doc/doxygen/inside_release.doc
   doc/doxygen/module-sd.doc
@@ -879,11 +844,9 @@ set(DOC_SOURCES
   doc/doxygen/ns3.doc
   doc/doxygen/outcomes.doc
   doc/doxygen/outcomes_logs.doc
-  doc/doxygen/outcomes_MC.doc
   doc/doxygen/outcomes_vizu.doc
   doc/doxygen/platform.doc
   doc/doxygen/platform_lua.doc
-  doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
   doc/doxygen/uhood_switch.doc
   doc/doxygen/uhood_arch.doc
@@ -905,6 +868,8 @@ set(DOC_SOURCES
   docs/source/img/extlink.png
   docs/source/img/extlink.svg
   docs/source/img/graphical-toc.svg
+  docs/source/img/lang_cpp.png
+  docs/source/img/lang_python.png
   docs/source/img/smpi_simgrid_alltoall_pair_16.png
   docs/source/img/smpi_simgrid_alltoall_ring_16.png
   docs/source/img/zone_hierarchy.png
@@ -915,6 +880,7 @@ set(DOC_SOURCES
   docs/source/app_msg.rst
   docs/source/app_s4u.rst
   docs/source/app_smpi.rst
+  docs/source/community.rst
   docs/source/index.rst
   docs/source/intro_concepts.rst
   docs/source/introduction.rst
@@ -949,6 +915,7 @@ set(DOC_SOURCES
   docs/source/tuto_smpi/3hosts.xml
   docs/source/tuto_smpi/img/big-picture.svg
   docs/source/tuto_smpi/img/lu.S.4.png
+  docs/source/tuto_smpi/gemm_mpi.cpp
   docs/source/tuto_smpi/roundtrip.c
 
   CITATION.bib
@@ -1005,21 +972,22 @@ set(txt_files
 # The list of cmake build directories is constructed from the following list.
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
-  examples/java/CMakeLists.txt
-  examples/msg/CMakeLists.txt
-    examples/msg/mc/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  examples/simdag/CMakeLists.txt
   examples/smpi/CMakeLists.txt
-    examples/smpi/NAS/CMakeLists.txt
-    examples/smpi/smpi_msg_masterslave/CMakeLists.txt
-    examples/smpi/replay_multiple/CMakeLists.txt
-    examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
-    examples/smpi/load_balancer_replay/CMakeLists.txt
-    examples/smpi/energy/f77/CMakeLists.txt
-    examples/smpi/energy/f90/CMakeLists.txt
+  examples/smpi/NAS/CMakeLists.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
+  examples/deprecated/msg/mc/CMakeLists.txt
+  examples/deprecated/simdag/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
+  teshsuite/lua/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
   teshsuite/s4u/CMakeLists.txt
@@ -1074,7 +1042,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/CTestCustom.cmake
   tools/cmake/DefinePackages.cmake
   tools/cmake/Distrib.cmake
-  tools/cmake/GCCFlags.cmake
+  tools/cmake/Flags.cmake
   tools/cmake/Documentation.cmake
   tools/cmake/MaintainerMode.cmake
   tools/cmake/Java.cmake
@@ -1088,25 +1056,15 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
-  tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
   tools/cmake/scripts/fixup_simgrid_dtd_l.pl
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
-  tools/cmake/UnitTesting.cmake
-  tools/cmake/src/internal_config.h.in
   tools/cmake/test_prog/prog_asan.cpp
-  tools/cmake/test_prog/prog_gnu_dynlinker.c
   tools/cmake/test_prog/prog_makecontext.c
-  tools/cmake/test_prog/prog_mutex_timedlock.c
-  tools/cmake/test_prog/prog_sem_init.c
-  tools/cmake/test_prog/prog_sem_open.c
-  tools/cmake/test_prog/prog_sem_timedwait.c
-  tools/cmake/test_prog/prog_snprintf.c
   tools/cmake/test_prog/prog_stackgrowth.c
   tools/cmake/test_prog/prog_stacksetup.c
-  tools/cmake/test_prog/prog_vsnprintf.c
   tools/cmake/cross-mingw.cmake
   tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as
@@ -1139,19 +1097,19 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
-  examples/platforms/trace/bourassa_state.trace
-  examples/platforms/trace/fafard_state.trace
-  examples/platforms/trace/faulty_host.trace
-  examples/platforms/trace/ginette_state.trace
-  examples/platforms/trace/jupiter_speed.trace
-  examples/platforms/trace/jupiter_state.trace
-  examples/platforms/trace/link1_avail.trace
-  examples/platforms/trace/link3_state.trace
-  examples/platforms/trace/link4_state.trace
-  examples/platforms/trace/linkBandwidth7.bw
-  examples/platforms/trace/trace_A_failure.txt
-  examples/platforms/trace/trace_A.txt
-  examples/platforms/trace/trace_B.txt
+  examples/platforms/profiles/bourassa_state.profile
+  examples/platforms/profiles/fafard_state.profile
+  examples/platforms/profiles/faulty_host.profile
+  examples/platforms/profiles/ginette_state.profile
+  examples/platforms/profiles/jupiter_speed.profile
+  examples/platforms/profiles/jupiter_state.profile
+  examples/platforms/profiles/link1_bandwidth.profile
+  examples/platforms/profiles/link1_latency.profile
+  examples/platforms/profiles/link3_state.profile
+  examples/platforms/profiles/link4_state.profile
+  examples/platforms/profiles/trace_A_failure.txt
+  examples/platforms/profiles/trace_A.txt
+  examples/platforms/profiles/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
@@ -1175,9 +1133,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/small_platform.xml
   examples/platforms/small_platform.lua
   examples/platforms/small_platform_constant.xml
+  examples/platforms/small_platform_failures.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_profile.xml
   examples/platforms/small_platform_with_routers.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord
@@ -1186,7 +1145,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/three_multicore_hosts.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform_shared.xml
-  examples/platforms/two_hosts_platform_with_availability.xml
+  examples/platforms/two_hosts_profiles.xml
   examples/platforms/two_hosts_platform_with_availability_included.xml
   examples/platforms/two_peers.xml
   examples/platforms/vivaldi.xml