X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a0323d530218db397d7380cf173ea621446745..a123c47d727be0441ca0702d10a3ef63437deca7:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index e3970eeae6..b47df3416e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1,30 +1,39 @@ ### define source packages set(EXTRA_DIST - src/bindings/java/MANIFEST.in + src/3rd-party/catch.hpp + src/3rd-party/xxhash.hpp src/bindings/python/simgrid_python.cpp src/dag/dax.dtd src/dag/dax_dtd.c src/dag/dax_dtd.h - src/include/catch.hpp - src/include/mc/datatypes.h - src/include/mc/mc.h - src/include/simgrid/sg_config.hpp - src/include/xbt/coverage.h - src/include/xbt/mmalloc.h - src/include/xbt/parmap.hpp - src/include/xbt/xbt_modinter.h - src/include/xxhash.hpp src/kernel/actor/Simcall.hpp + src/kernel/resource/HostImpl.hpp src/kernel/resource/LinkImpl.hpp src/kernel/resource/NetworkModel.hpp src/kernel/resource/NetworkModelFactors.hpp src/kernel/resource/SplitDuplexLinkImpl.hpp src/kernel/resource/StandardLinkImpl.hpp src/kernel/resource/WifiLinkImpl.hpp + src/kernel/resource/models/cpu_cas01.hpp + src/kernel/resource/models/cpu_ti.hpp + src/kernel/resource/models/disk_s19.hpp + src/kernel/resource/models/host_clm03.hpp + src/kernel/resource/models/network_cm02.hpp + src/kernel/resource/models/network_constant.hpp + src/kernel/resource/models/network_ib.hpp + src/kernel/resource/models/network_ns3.hpp + src/kernel/resource/models/ns3/ns3_simulator.hpp + src/kernel/resource/models/ptask_L07.hpp + + src/mc/datatypes.h + src/mc/mc.h src/mc/mc_mmu.hpp src/mc/mc_record.hpp - src/msg/msg_private.hpp + + src/simgrid/sg_config.hpp + src/simgrid/math_utils.h + src/smpi/colls/coll_tuned_topo.hpp src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -32,32 +41,24 @@ set(EXTRA_DIST src/smpi/include/smpi_utils.hpp src/smpi/smpi_main.c src/smpi/smpi_replay_main.cpp - src/surf/HostImpl.hpp - src/surf/cpu_cas01.hpp - src/surf/cpu_ti.hpp - src/surf/disk_s19.hpp - src/surf/host_clm03.hpp - src/surf/network_cm02.hpp - src/surf/network_constant.hpp - src/surf/network_ib.hpp - src/surf/network_ns3.hpp - src/surf/ns3/ns3_simulator.hpp - src/surf/ptask_L07.hpp - src/surf/surf_interface.hpp - src/surf/xml/simgrid.dtd - src/surf/xml/simgrid_dtd.c - src/surf/xml/simgrid_dtd.h - src/surf/xml/surfxml_sax_cb.cpp + src/kernel/xml/simgrid.dtd + src/kernel/xml/simgrid_dtd.c + src/kernel/xml/simgrid_dtd.h + src/kernel/xml/platf_sax_cb.cpp src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.lex src/xbt/automaton/parserPromela.tab.cacc src/xbt/automaton/parserPromela.tab.hacc src/xbt/automaton/parserPromela.yacc + src/xbt/coverage.h src/xbt/dict_private.h src/xbt/log_private.hpp src/xbt/mallocator_private.h - + src/xbt/parmap.hpp + src/xbt/xbt_modinter.h + + src/xbt/mmalloc/mmalloc.h src/xbt/mmalloc/mfree.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c @@ -245,7 +246,7 @@ set(SMPI_SRC src/smpi/plugins/ampi/ampi.hpp src/smpi/plugins/ampi/instr_ampi.cpp src/smpi/plugins/ampi/instr_ampi.hpp - src/surf/network_ib.cpp + src/kernel/resource/models/network_ib.cpp ) set(STHREAD_SRC src/sthread/sthread_impl.cpp @@ -294,14 +295,58 @@ else() endif() set(NS3_SRC - src/surf/network_ns3.cpp - src/surf/ns3/ns3_simulator.cpp + src/kernel/resource/models/network_ns3.cpp + src/kernel/resource/models/ns3/ns3_simulator.cpp ) -set(SURF_SRC +set(KERNEL_SRC + src/deprecated.cpp + src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp + src/kernel/activity/ActivityImpl.cpp + src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/BarrierImpl.cpp + src/kernel/activity/BarrierImpl.hpp + src/kernel/activity/CommImpl.cpp + src/kernel/activity/CommImpl.hpp + src/kernel/activity/ConditionVariableImpl.cpp + src/kernel/activity/ConditionVariableImpl.hpp + src/kernel/activity/ExecImpl.cpp + src/kernel/activity/ExecImpl.hpp + src/kernel/activity/IoImpl.cpp + src/kernel/activity/IoImpl.hpp + src/kernel/activity/MailboxImpl.cpp + 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/Synchro.cpp + src/kernel/activity/Synchro.hpp + + src/kernel/actor/ActorImpl.cpp + src/kernel/actor/ActorImpl.hpp + src/kernel/actor/CommObserver.cpp + src/kernel/actor/CommObserver.hpp + src/kernel/actor/Simcall.cpp + src/kernel/actor/SimcallObserver.cpp + src/kernel/actor/SimcallObserver.hpp + src/kernel/actor/SynchroObserver.cpp + src/kernel/actor/SynchroObserver.hpp + + src/kernel/context/Context.cpp + 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/kernel/lmm/System.cpp src/kernel/lmm/System.hpp src/kernel/lmm/fair_bottleneck.cpp @@ -316,6 +361,7 @@ set(SURF_SRC src/kernel/resource/DiskImpl.hpp src/kernel/resource/FactorSet.cpp src/kernel/resource/FactorSet.hpp + src/kernel/resource/HostImpl.cpp src/kernel/resource/Model.cpp src/kernel/resource/NetworkModel.cpp src/kernel/resource/NetworkModelFactors.cpp @@ -326,6 +372,14 @@ set(SURF_SRC src/kernel/resource/VirtualMachineImpl.hpp src/kernel/resource/WifiLinkImpl.cpp + src/kernel/resource/models/cpu_cas01.cpp + src/kernel/resource/models/cpu_ti.cpp + src/kernel/resource/models/disk_s19.cpp + src/kernel/resource/models/host_clm03.cpp + src/kernel/resource/models/network_cm02.cpp + src/kernel/resource/models/network_constant.cpp + src/kernel/resource/models/ptask_L07.cpp + src/kernel/resource/profile/Event.hpp src/kernel/resource/profile/FutureEvtSet.cpp src/kernel/resource/profile/FutureEvtSet.hpp @@ -352,24 +406,14 @@ set(SURF_SRC src/kernel/timer/Timer.cpp - src/surf/HostImpl.cpp - src/surf/cpu_cas01.cpp - src/surf/cpu_ti.cpp - src/surf/disk_s19.cpp - src/surf/host_clm03.cpp - src/surf/network_cm02.cpp - src/surf/network_constant.cpp - src/surf/ptask_L07.cpp - src/surf/sg_platf.cpp - src/surf/surf_interface.cpp - src/surf/xml/platf.hpp - src/surf/xml/platf_private.hpp - src/surf/xml/surfxml_parseplatf.cpp - src/surf/xml/surfxml_sax_cb.cpp + src/kernel/xml/platf.hpp + src/kernel/xml/platf_private.hpp + src/kernel/xml/sg_platf.cpp + src/kernel/xml/platf_sax_cb.cpp ) if (Eigen3_FOUND) - set(SURF_SRC - ${SURF_SRC} + set(KERNEL_SRC + ${KERNEL_SRC} src/kernel/lmm/bmf.cpp src/kernel/lmm/bmf.hpp) else() @@ -378,6 +422,18 @@ else() src/kernel/lmm/bmf.cpp src/kernel/lmm/bmf.hpp) endif() +# Boost context may not be available +if (HAVE_BOOST_CONTEXTS) + set(KERNEL_SRC + ${KERNEL_SRC} + src/kernel/context/ContextBoost.cpp + src/kernel/context/ContextBoost.hpp) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + src/kernel/context/ContextBoost.cpp + src/kernel/context/ContextBoost.hpp) +endif() set(PLUGINS_SRC src/plugins/ProducerConsumer.cpp @@ -394,61 +450,6 @@ set(PLUGINS_SRC src/plugins/vm/dirty_page_tracking.cpp ) -set(SIMIX_SRC - src/kernel/activity/ActivityImpl.cpp - src/kernel/activity/ActivityImpl.hpp - src/kernel/activity/BarrierImpl.cpp - src/kernel/activity/BarrierImpl.hpp - src/kernel/activity/CommImpl.cpp - src/kernel/activity/CommImpl.hpp - src/kernel/activity/ConditionVariableImpl.cpp - src/kernel/activity/ConditionVariableImpl.hpp - src/kernel/activity/ExecImpl.cpp - src/kernel/activity/ExecImpl.hpp - src/kernel/activity/IoImpl.cpp - src/kernel/activity/IoImpl.hpp - src/kernel/activity/MailboxImpl.cpp - 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/Synchro.cpp - src/kernel/activity/Synchro.hpp - src/kernel/actor/ActorImpl.cpp - src/kernel/actor/ActorImpl.hpp - src/kernel/actor/CommObserver.cpp - src/kernel/actor/CommObserver.hpp - src/kernel/actor/Simcall.cpp - src/kernel/actor/SimcallObserver.cpp - src/kernel/actor/SimcallObserver.hpp - src/kernel/actor/SynchroObserver.cpp - src/kernel/actor/SynchroObserver.hpp - src/kernel/context/Context.cpp - 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/libsmx.cpp - ) - -# Boost context may not be available -if (HAVE_BOOST_CONTEXTS) - set(SIMIX_SRC - ${SIMIX_SRC} - src/kernel/context/ContextBoost.cpp - src/kernel/context/ContextBoost.hpp) -else() - set(EXTRA_DIST - ${EXTRA_DIST} - src/kernel/context/ContextBoost.cpp - src/kernel/context/ContextBoost.hpp) -endif() set(S4U_SRC src/s4u/s4u_Activity.cpp @@ -471,78 +472,17 @@ set(S4U_SRC set(SIMGRID_SRC src/simgrid/Exception.cpp + src/simgrid/module.cpp + src/simgrid/module.hpp src/simgrid/sg_config.cpp src/simgrid/sg_version.cpp src/simgrid/util.hpp ) -set(MSG_SRC - src/msg/msg_comm.cpp - src/msg/msg_global.cpp - src/msg/msg_legacy.cpp - src/msg/msg_process.cpp - src/msg/msg_task.cpp - ) - set(DAG_SRC src/dag/loaders.cpp ) -set(JMSG_C_SRC - src/bindings/java/JavaContext.cpp - src/bindings/java/JavaContext.hpp - src/bindings/java/jmsg.cpp - src/bindings/java/jmsg.hpp - src/bindings/java/jmsg_as.cpp - src/bindings/java/jmsg_as.hpp - src/bindings/java/jmsg_comm.cpp - src/bindings/java/jmsg_comm.h - src/bindings/java/jmsg_host.cpp - src/bindings/java/jmsg_host.h - src/bindings/java/jmsg_process.cpp - src/bindings/java/jmsg_process.h - src/bindings/java/jmsg_synchro.cpp - src/bindings/java/jmsg_synchro.h - src/bindings/java/jmsg_task.cpp - src/bindings/java/jmsg_task.h - src/bindings/java/jmsg_vm.cpp - src/bindings/java/jmsg_vm.h - src/bindings/java/jxbt_utilities.cpp - src/bindings/java/jxbt_utilities.hpp - ) - -set(JMSG_JAVA_SRC - 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/Host.java - src/bindings/java/org/simgrid/msg/HostFailureException.java - src/bindings/java/org/simgrid/msg/HostNotFoundException.java - src/bindings/java/org/simgrid/msg/JniException.java - 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/Process.java - src/bindings/java/org/simgrid/msg/ProcessKilledError.java - src/bindings/java/org/simgrid/msg/ProcessNotFoundException.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 - ) - -set(JTRACE_C_SRC - src/bindings/java/jtrace.cpp - src/bindings/java/jtrace.h - ) - -set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java) - -list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) -list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) - set(TRACING_SRC src/instr/instr_config.cpp src/instr/instr_interface.cpp @@ -585,6 +525,15 @@ set(MC_SRC src/mc/explo/UdporChecker.cpp src/mc/explo/UdporChecker.hpp + src/mc/explo/udpor/Configuration.hpp + src/mc/explo/udpor/Configuration.cpp + src/mc/explo/udpor/EventSet.cpp + src/mc/explo/udpor/EventSet.hpp + src/mc/explo/udpor/StateManager.cpp + src/mc/explo/udpor/StateManager.hpp + src/mc/explo/udpor/UnfoldingEvent.cpp + src/mc/explo/udpor/UnfoldingEvent.hpp + src/mc/inspect/DwarfExpression.cpp src/mc/inspect/DwarfExpression.hpp src/mc/inspect/Frame.cpp @@ -651,8 +600,6 @@ set(MC_SRC src/mc/mc_forward.hpp src/mc/mc_private.hpp src/mc/mc_record.cpp - src/mc/udpor_global.cpp - src/mc/udpor_global.hpp src/xbt/mmalloc/mm_interface.c ) @@ -728,7 +675,6 @@ set(headers_to_install include/smpi/mpi.h include/smpi/sampi.h include/smpi/smpi.h - include/smpi/smpi_main.h include/smpi/smpi_helpers.h include/smpi/smpi_helpers_internal.h include/smpi/smpi_extended_traces.h @@ -780,7 +726,7 @@ set(source_of_generated_headers ### depend of some variables set upper if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SIMIX_SRC ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp + set(KERNEL_SRC ${KERNEL_SRC} src/kernel/context/ContextUnix.hpp src/kernel/context/ContextUnix.cpp) else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp @@ -792,22 +738,13 @@ set(simgrid_sources ${S4U_SRC} ${SIMGRID_SRC} ${MC_SRC_BASE} - ${SIMIX_SRC} - ${SURF_SRC} + ${KERNEL_SRC} ${TRACING_SRC} ${XBT_SRC} ${PLUGINS_SRC} ${DAG_SRC} ) -if(${enable_msg}) - set(headers_to_install ${headers_to_install} include/simgrid/msg.h) - set(simgrid_sources ${simgrid_sources} ${MSG_SRC}) -else() - set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/msg.h - ${MSG_SRC}) -endif() - if(enable_smpi) set(simgrid_sources ${simgrid_sources} ${SMPI_SRC}) endif() @@ -826,15 +763,9 @@ endif() set(DOC_SOURCES doc/doxygen/FAQ.doc - doc/doxygen/inside.doc - doc/doxygen/inside_tests.doc - doc/doxygen/inside_cmake.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc - doc/doxygen/module-surf.doc - doc/doxygen/module-index.doc doc/doxygen/outcomes_vizu.doc - doc/doxygen/platform.doc doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc @@ -858,20 +789,6 @@ set(DOC_SOURCES docs/source/_ext/showfile.css docs/source/_ext/showfile.js docs/source/_ext/showfile.py - docs/source/_ext/javasphinx/LICENSE - docs/source/_ext/javasphinx/MANIFEST.in - docs/source/_ext/javasphinx/README.md - docs/source/_ext/javasphinx/doc/conf.py - docs/source/_ext/javasphinx/doc/index.rst - docs/source/_ext/javasphinx/javasphinx/__init__.py - docs/source/_ext/javasphinx/javasphinx/apidoc.py - docs/source/_ext/javasphinx/javasphinx/compiler.py - docs/source/_ext/javasphinx/javasphinx/domain.py - docs/source/_ext/javasphinx/javasphinx/extdoc.py - docs/source/_ext/javasphinx/javasphinx/formatter.py - docs/source/_ext/javasphinx/javasphinx/htmlrst.py - docs/source/_ext/javasphinx/javasphinx/util.py - docs/source/_ext/javasphinx/setup.py docs/source/_static/css/custom.css docs/source/_templates/breadcrumbs.html @@ -880,6 +797,7 @@ set(DOC_SOURCES docs/source/img/extlink.svg docs/source/img/graphical-toc.svg docs/source/img/lmm-overview.svg + docs/source/img/plugin-energy.svg docs/source/img/smpi_simgrid_alltoall_pair_16.png docs/source/img/smpi_simgrid_alltoall_ring_16.png docs/source/img/starzone.drawio @@ -892,7 +810,6 @@ set(DOC_SOURCES docs/source/img/zoom_comm.svg docs/source/application.rst - docs/source/app_msg.rst docs/source/app_s4u.rst docs/source/app_smpi.rst docs/source/The_XBT_toolbox.rst @@ -900,6 +817,8 @@ set(DOC_SOURCES docs/source/community.rst docs/source/Configuring_SimGrid.rst docs/source/Deploying_your_application.rst + docs/source/Contributors_Documentation.rst + docs/source/Examples.rst docs/source/Experimental_setup.rst docs/source/index.rst docs/source/intl.rst @@ -944,6 +863,9 @@ set(DOC_SOURCES docs/source/tuto_smpi/gemm_mpi.cpp docs/source/tuto_smpi/roundtrip.c + docs/source/tuto_mc/ndet-receive-mpi.c + docs/source/tuto_mc/ndet-receive-s4u.cpp + docs/source/tuto_disk/analysis.org docs/source/tuto_disk/analysis.irst docs/source/tuto_disk/CMakeLists.txt @@ -956,8 +878,6 @@ set(DOC_SOURCES docs/source/tuto_disk/fig/simgrid_results.png docs/source/tuto_disk/init.el docs/source/tuto_disk/tuto_disk.cpp - docs/source/tuto_network_calibration/clustering_ckmeans.ipynb - docs/source/tuto_network_calibration/clustering_dhist.ipynb docs/source/tuto_network_calibration/CMakeLists.txt docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp docs/source/tuto_network_calibration/dahu_platform_dhist.cpp @@ -995,12 +915,6 @@ set(DOC_TOOLS ) # these files get copied automatically to the html documentation -set(DOC_IMG - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf - ) set(bin_files ${bin_files} @@ -1027,7 +941,6 @@ set(txt_files set(CMAKEFILES_TXT examples/c/CMakeLists.txt examples/cpp/CMakeLists.txt - examples/deprecated/java/CMakeLists.txt examples/platforms/CMakeLists.txt examples/python/CMakeLists.txt examples/smpi/CMakeLists.txt @@ -1038,11 +951,9 @@ set(CMAKEFILES_TXT examples/smpi/smpi_s4u_masterworker/CMakeLists.txt examples/sthread/CMakeLists.txt - teshsuite/java/CMakeLists.txt teshsuite/kernel/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/models/CMakeLists.txt - teshsuite/msg/CMakeLists.txt teshsuite/platforms/CMakeLists.txt teshsuite/python/CMakeLists.txt teshsuite/s4u/CMakeLists.txt @@ -1082,7 +993,6 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/topo/CMakeLists.txt - teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt tools/CMakeLists.txt tools/graphicator/CMakeLists.txt @@ -1101,10 +1011,8 @@ set(CMAKE_SOURCE_FILES tools/cmake/Distrib.cmake tools/cmake/Documentation.cmake tools/cmake/Flags.cmake - tools/cmake/Java.cmake tools/cmake/MaintainerMode.cmake tools/cmake/MakeLib.cmake - tools/cmake/MakeLibWin.cmake tools/cmake/Modules/FindGraphviz.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibelf.cmake @@ -1116,7 +1024,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/pybind11Config.cmake tools/cmake/Option.cmake tools/cmake/Tests.cmake - tools/cmake/cross-mingw.cmake tools/cmake/scripts/fixup_simgrid_dtd_l.pl tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl