X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/697e0a51e575c5fa232dd7559010aea53c213076..66473d9497b469b76d1433e52d6c2690d42b109e:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5cd6e8ab06..3a03fc299a 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -25,7 +25,7 @@ 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 @@ -56,7 +56,7 @@ set(EXTRA_DIST 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 @@ -305,8 +305,6 @@ set(NS3_SRC ) set(KERNEL_SRC - src/deprecated.cpp - src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp @@ -342,7 +340,7 @@ set(KERNEL_SRC 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 @@ -454,11 +452,13 @@ set(PLUGINS_SRC src/plugins/vm/VmLiveMigration.hpp src/plugins/vm/dirty_page_tracking.cpp src/plugins/battery.cpp + src/plugins/photovoltaic.cpp ) 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 @@ -473,6 +473,7 @@ set(S4U_SRC 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 ) @@ -519,19 +520,32 @@ set(MC_SRC_BASE src/mc/mc_replay.hpp src/mc/transition/Transition.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 @@ -562,7 +576,7 @@ set(MC_SRC_STATEFUL 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 @@ -580,7 +594,7 @@ set(MC_SRC_STATEFUL 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 @@ -599,7 +613,7 @@ set(MC_SRC_STATEFUL src/mc/inspect/mc_unw.cpp src/mc/inspect/mc_unw.hpp src/mc/inspect/mc_unw_vmread.cpp - + src/mc/sosp/ChunkedData.cpp src/mc/sosp/ChunkedData.hpp src/mc/sosp/PageStore.cpp @@ -615,15 +629,18 @@ set(MC_SRC_STATEFUL src/mc/VisitedState.cpp src/mc/VisitedState.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/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/WaitStrategy.hpp - + src/mc/api/strategy/UniformStrategy.hpp + src/xbt/mmalloc/mm_interface.c ) @@ -637,18 +654,18 @@ set(headers_to_install include/simgrid/exec.h include/simgrid/Exception.hpp include/simgrid/chrono.hpp + include/simgrid/plugins/battery.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h - include/simgrid/plugins/battery.hpp include/simgrid/plugins/file_system.h include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h + include/simgrid/plugins/photovoltaic.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 @@ -661,6 +678,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 @@ -675,6 +693,7 @@ set(headers_to_install 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 @@ -757,7 +776,7 @@ else() # NOT ucontext src/kernel/context/ContextUnix.cpp) endif() -### Simgrid Lib sources +### SimGrid Lib sources set(simgrid_sources ${S4U_SRC} ${SIMGRID_SRC} @@ -1067,6 +1086,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 @@ -1082,7 +1102,6 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/battery_platform.xml examples/platforms/bypassRoute.xml examples/platforms/bypassZoneRoute.xml examples/platforms/cloud.xml @@ -1119,6 +1138,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf examples/platforms/optorsim/transform_optorsim_platform.pl + examples/platforms/photovoltaic_platform.xml examples/platforms/profiles/fafard_state.profile examples/platforms/profiles/faulty_host.profile examples/platforms/profiles/ginette_state.profile