X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78d426efd0d78380e29df1c1496897d2bc62f596..2da930cb71158d192643133d1cb374f94525fa63:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 410426e1d4..133bbd920d 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1,19 +1,12 @@ ### define source packages set(EXTRA_DIST + 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 @@ -32,9 +25,15 @@ set(EXTRA_DIST 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/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 @@ -42,21 +41,23 @@ set(EXTRA_DIST src/smpi/include/smpi_utils.hpp src/smpi/smpi_main.c src/smpi/smpi_replay_main.cpp - src/surf/surf_interface.hpp src/kernel/xml/simgrid.dtd src/kernel/xml/simgrid_dtd.c src/kernel/xml/simgrid_dtd.h - src/kernel/xml/surfxml_sax_cb.cpp + 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/mmalloc/mmalloc.h src/xbt/mmalloc/mfree.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c @@ -250,6 +251,7 @@ set(STHREAD_SRC src/sthread/sthread_impl.cpp src/sthread/sthread.c src/sthread/sthread.h + src/sthread/ObjectAccess.cpp ) set(XBT_SRC @@ -276,13 +278,18 @@ set(XBT_SRC 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_misc.cpp src/xbt/xbt_os_file.cpp src/xbt/xbt_os_time.c src/xbt/xbt_parse_units.cpp src/xbt/xbt_replay.cpp src/xbt/xbt_str.cpp - src/xbt/xbt_virtu.cpp + src/xbt/utils/iter/iterator_wrapping.hpp + src/xbt/utils/iter/subsets.hpp + src/xbt/utils/iter/powerset.hpp + src/xbt/utils/iter/variable_for_loop.hpp + src/xbt/utils/iter/LazyKSubsets.hpp + src/xbt/utils/iter/LazyPowerset.hpp ) if(HAVE_MMALLOC) @@ -297,10 +304,56 @@ set(NS3_SRC src/kernel/resource/models/ns3/ns3_simulator.cpp ) -set(SURF_SRC +set(KERNEL_SRC 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/MessImpl.cpp + src/kernel/activity/MessImpl.hpp + src/kernel/activity/MessageQueueImpl.cpp + src/kernel/activity/MessageQueueImpl.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 @@ -363,12 +416,11 @@ set(SURF_SRC src/kernel/xml/platf.hpp src/kernel/xml/platf_private.hpp src/kernel/xml/sg_platf.cpp - src/kernel/xml/surfxml_parseplatf.cpp - src/kernel/xml/surfxml_sax_cb.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() @@ -377,6 +429,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 @@ -385,72 +449,22 @@ set(PLUGINS_SRC src/plugins/host_dvfs.cpp src/plugins/host_energy.cpp src/plugins/host_load.cpp + src/plugins/jbod.cpp src/plugins/link_energy.cpp src/plugins/link_energy_wifi.cpp src/plugins/link_load.cpp src/plugins/vm/VmLiveMigration.cpp src/plugins/vm/VmLiveMigration.hpp src/plugins/vm/dirty_page_tracking.cpp + src/plugins/battery.cpp + src/plugins/chiller.cpp + src/plugins/solar_panel.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 + src/s4u/s4u_ActivitySet.cpp src/s4u/s4u_Actor.cpp src/s4u/s4u_Barrier.cpp src/s4u/s4u_Comm.cpp @@ -462,9 +476,12 @@ set(S4U_SRC src/s4u/s4u_Io.cpp src/s4u/s4u_Link.cpp src/s4u/s4u_Mailbox.cpp + src/s4u/s4u_Mess.cpp + src/s4u/s4u_MessageQueue.cpp src/s4u/s4u_Mutex.cpp src/s4u/s4u_Netzone.cpp src/s4u/s4u_Semaphore.cpp + src/s4u/s4u_Task.cpp src/s4u/s4u_VirtualMachine.cpp ) @@ -512,17 +529,80 @@ set(MC_SRC_BASE src/mc/transition/Transition.cpp ) -set(MC_SRC - src/mc/explo/CommunicationDeterminismChecker.cpp +set(MC_SRC_STATELESS + src/mc/api/ActorState.hpp + src/mc/api/ClockVector.cpp + src/mc/api/ClockVector.hpp + src/mc/api/State.cpp + src/mc/api/State.hpp + src/mc/api/RemoteApp.cpp + src/mc/api/RemoteApp.hpp + src/mc/explo/DFSExplorer.cpp src/mc/explo/DFSExplorer.hpp src/mc/explo/Exploration.cpp src/mc/explo/Exploration.hpp + + src/mc/explo/odpor/Execution.cpp + src/mc/explo/odpor/Execution.hpp + src/mc/explo/odpor/ReversibleRaceCalculator.cpp + src/mc/explo/odpor/ReversibleRaceCalculator.hpp + src/mc/explo/odpor/WakeupTree.cpp + src/mc/explo/odpor/WakeupTree.hpp + src/mc/explo/odpor/WakeupTreeIterator.cpp + src/mc/explo/odpor/WakeupTreeIterator.hpp + src/mc/explo/odpor/odpor_forward.hpp + src/mc/explo/odpor/odpor_tests_private.hpp + + src/mc/remote/AppSide.cpp + src/mc/remote/AppSide.hpp + src/mc/remote/Channel.cpp + src/mc/remote/Channel.hpp + src/mc/remote/CheckerSide.cpp + src/mc/remote/CheckerSide.hpp + src/mc/remote/RemotePtr.hpp + src/mc/remote/mc_protocol.h + + src/mc/transition/Transition.hpp + src/mc/transition/TransitionActorJoin.cpp + src/mc/transition/TransitionActorJoin.hpp + src/mc/transition/TransitionAny.cpp + src/mc/transition/TransitionAny.hpp + src/mc/transition/TransitionComm.cpp + src/mc/transition/TransitionComm.hpp + src/mc/transition/TransitionObjectAccess.cpp + src/mc/transition/TransitionObjectAccess.hpp + src/mc/transition/TransitionRandom.cpp + src/mc/transition/TransitionRandom.hpp + src/mc/transition/TransitionSynchro.cpp + src/mc/transition/TransitionSynchro.hpp + ) + +set(MC_SRC_STATEFUL + src/mc/explo/CommunicationDeterminismChecker.cpp src/mc/explo/LivenessChecker.cpp src/mc/explo/LivenessChecker.hpp src/mc/explo/UdporChecker.cpp src/mc/explo/UdporChecker.hpp + src/mc/explo/udpor/Comb.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/ExtensionSetCalculator.cpp + src/mc/explo/udpor/ExtensionSetCalculator.hpp + src/mc/explo/udpor/History.cpp + src/mc/explo/udpor/History.hpp + src/mc/explo/udpor/maximal_subsets_iterator.cpp + src/mc/explo/udpor/maximal_subsets_iterator.hpp + src/mc/explo/udpor/UnfoldingEvent.cpp + src/mc/explo/udpor/UnfoldingEvent.hpp + src/mc/explo/udpor/Unfolding.cpp + src/mc/explo/udpor/Unfolding.hpp + src/mc/explo/udpor/udpor_forward.hpp + src/mc/explo/udpor/udpor_tests_private.hpp + src/mc/inspect/DwarfExpression.cpp src/mc/inspect/DwarfExpression.hpp src/mc/inspect/Frame.cpp @@ -542,55 +622,32 @@ set(MC_SRC src/mc/inspect/mc_unw.hpp src/mc/inspect/mc_unw_vmread.cpp - src/mc/remote/AppSide.cpp - src/mc/remote/AppSide.hpp - src/mc/remote/Channel.cpp - src/mc/remote/Channel.hpp - src/mc/remote/CheckerSide.cpp - src/mc/remote/CheckerSide.hpp - src/mc/remote/RemoteProcess.cpp - src/mc/remote/RemoteProcess.hpp - src/mc/remote/RemotePtr.hpp - src/mc/remote/mc_protocol.h - src/mc/sosp/ChunkedData.cpp src/mc/sosp/ChunkedData.hpp src/mc/sosp/PageStore.cpp src/mc/sosp/PageStore.hpp src/mc/sosp/Region.cpp src/mc/sosp/Region.hpp + src/mc/sosp/RemoteProcessMemory.cpp + src/mc/sosp/RemoteProcessMemory.hpp src/mc/sosp/Snapshot.cpp src/mc/sosp/Snapshot.hpp - src/mc/transition/Transition.hpp - src/mc/transition/TransitionActorJoin.cpp - src/mc/transition/TransitionActorJoin.hpp - src/mc/transition/TransitionAny.cpp - src/mc/transition/TransitionAny.hpp - src/mc/transition/TransitionComm.cpp - src/mc/transition/TransitionComm.hpp - src/mc/transition/TransitionRandom.cpp - src/mc/transition/TransitionRandom.hpp - src/mc/transition/TransitionSynchro.cpp - src/mc/transition/TransitionSynchro.hpp - src/mc/AddressSpace.hpp - src/mc/ModelChecker.cpp - src/mc/ModelChecker.hpp src/mc/VisitedState.cpp src/mc/VisitedState.hpp - src/mc/api/ActorState.hpp - src/mc/api/State.cpp - src/mc/api/State.hpp - src/mc/api/RemoteApp.cpp - src/mc/api/RemoteApp.hpp src/mc/compare.cpp + src/mc/mc_environ.h src/mc/mc_exit.hpp 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/mc/api/strategy/BasicStrategy.hpp + src/mc/api/strategy/MaxMatchComm.hpp + src/mc/api/strategy/MinMatchComm.hpp + src/mc/api/strategy/Strategy.hpp + src/mc/api/strategy/UniformStrategy.hpp src/xbt/mmalloc/mm_interface.c ) @@ -599,23 +656,27 @@ set(MC_SIMGRID_MC_SRC src/mc/explo/simgrid_mc.cpp) set(headers_to_install include/simgrid/actor.h + include/simgrid/activity_set.h include/simgrid/barrier.h include/simgrid/comm.h include/simgrid/engine.h include/simgrid/exec.h include/simgrid/Exception.hpp include/simgrid/chrono.hpp + include/simgrid/plugins/battery.hpp + include/simgrid/plugins/chiller.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h include/simgrid/plugins/file_system.h + include/simgrid/plugins/jbod.hpp include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h + include/simgrid/plugins/solar_panel.hpp include/simgrid/plugins/ProducerConsumer.hpp include/simgrid/instr.h include/simgrid/mailbox.h include/simgrid/modelchecker.h include/simgrid/forward.h - include/simgrid/simix.h include/simgrid/simix.hpp include/simgrid/kernel/ProfileBuilder.hpp include/simgrid/kernel/Timer.hpp @@ -628,6 +689,7 @@ set(headers_to_install include/simgrid/vm.h include/simgrid/zone.h include/simgrid/s4u/Activity.hpp + include/simgrid/s4u/ActivitySet.hpp include/simgrid/s4u/Actor.hpp include/simgrid/s4u/Barrier.hpp include/simgrid/s4u/Comm.hpp @@ -639,9 +701,12 @@ set(headers_to_install include/simgrid/s4u/Io.hpp include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp + include/simgrid/s4u/MessageQueue.hpp + include/simgrid/s4u/Mess.hpp include/simgrid/s4u/Mutex.hpp include/simgrid/s4u/NetZone.hpp include/simgrid/s4u/Semaphore.hpp + include/simgrid/s4u/Task.hpp include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp @@ -717,20 +782,19 @@ 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 src/kernel/context/ContextUnix.cpp) endif() -### Simgrid Lib sources +### SimGrid Lib sources set(simgrid_sources ${S4U_SRC} ${SIMGRID_SRC} ${MC_SRC_BASE} - ${SIMIX_SRC} - ${SURF_SRC} + ${KERNEL_SRC} ${TRACING_SRC} ${XBT_SRC} ${PLUGINS_SRC} @@ -742,8 +806,12 @@ if(enable_smpi) endif() if(SIMGRID_HAVE_MC) - set(simgrid_sources ${simgrid_sources} ${MC_SRC}) + set(simgrid_sources ${simgrid_sources} ${MC_SRC_STATELESS}) endif() +if(SIMGRID_HAVE_STATEFUL_MC) + set(simgrid_sources ${simgrid_sources} ${MC_SRC_STATEFUL}) +endif() +set(EXTRA_DIST ${EXTRA_DIST} ${MC_SRC_STATELESS} ${MC_SRC_STATEFUL}) if(SIMGRID_HAVE_NS3) set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp) @@ -784,6 +852,9 @@ set(DOC_SOURCES docs/source/_static/css/custom.css docs/source/_templates/breadcrumbs.html + docs/source/img/design-scheduling-parallel.svg + docs/source/img/design-scheduling-simulatedtime.svg + docs/source/img/design-scheduling-wallclock.svg docs/source/img/eclipseScreenShot.png docs/source/img/extlink.png docs/source/img/extlink.svg @@ -847,6 +918,12 @@ set(DOC_SOURCES docs/source/tuto_s4u/master-workers-lab3.cpp docs/source/tuto_s4u/master-workers-lab4.cpp + docs/source/Tutorial_DAG.rst + docs/source/img/battery_degradation.svg + docs/source/img/dag1.svg + docs/source/img/dag2.svg + docs/source/img/dag.svg + docs/source/Tutorial_MPI_Applications.rst docs/source/tuto_smpi/3hosts.png docs/source/tuto_smpi/3hosts.xml @@ -1013,6 +1090,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake tools/cmake/Modules/FindValgrind.cmake + tools/cmake/Modules/nlohmann_jsonConfig.cmake tools/cmake/Modules/pybind11Config.cmake tools/cmake/Option.cmake tools/cmake/Tests.cmake @@ -1021,6 +1099,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/test_prog/prog_asan.cpp tools/cmake/test_prog/prog_makecontext.c + tools/cmake/test_prog/prog_ns3.cpp tools/cmake/test_prog/prog_stackgrowth.c tools/cmake/test_prog/prog_stacksetup.c tools/cmake/test_prog/prog_tsan.cpp