X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a46c5fd66bc7ae999da8b278feab650c02e3adcf..87089f2cac36e30a41d71a5b0dd0715e468a58ed:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 3a18f94d4f..ed9cb8875c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -12,6 +12,7 @@ set(EXTRA_DIST src/include/xbt/xbt_modinter.h src/include/catch.hpp src/include/xxhash.hpp + src/kernel/actor/Simcall.hpp src/kernel/resource/LinkImpl.hpp src/kernel/resource/SplitDuplexLinkImpl.hpp src/kernel/resource/StandardLinkImpl.hpp @@ -22,13 +23,6 @@ set(EXTRA_DIST src/dag/dax.dtd src/dag/dax_dtd.c src/dag/dax_dtd.h - src/simix/simcalls.in - src/simix/simcalls.py - src/simix/popping_private.hpp - src/simix/popping_bodies.cpp - src/simix/popping_generated.cpp - src/simix/popping_enum.hpp - src/simix/popping_accessors.hpp src/smpi/colls/coll_tuned_topo.hpp src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -298,6 +292,8 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cpp ) set(SURF_SRC + src/kernel/lmm/bmf.hpp + src/kernel/lmm/bmf.cpp src/kernel/lmm/fair_bottleneck.cpp src/kernel/lmm/maxmin.hpp src/kernel/lmm/maxmin.cpp @@ -316,8 +312,6 @@ set(SURF_SRC src/kernel/resource/VirtualMachineImpl.cpp src/kernel/resource/WifiLinkImpl.cpp - src/kernel/resource/profile/DatedValue.cpp - src/kernel/resource/profile/DatedValue.hpp src/kernel/resource/profile/Event.hpp src/kernel/resource/profile/FutureEvtSet.cpp src/kernel/resource/profile/FutureEvtSet.hpp @@ -365,6 +359,7 @@ set(SURF_SRC set(PLUGINS_SRC src/plugins/ProducerConsumer.cpp + src/plugins/chaos_monkey.cpp src/plugins/host_dvfs.cpp src/plugins/host_energy.cpp src/plugins/link_energy.cpp @@ -377,11 +372,7 @@ set(PLUGINS_SRC src/plugins/vm/VmLiveMigration.hpp ) -set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC - src/kernel/future.cpp - src/simix/libsmx.cpp - src/simix/smx_context.cpp src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp @@ -390,9 +381,10 @@ set(SIMIX_SRC src/kernel/context/ContextSwapped.hpp src/kernel/context/ContextThread.cpp src/kernel/context/ContextThread.hpp - src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/BarrierImpl.cpp + src/kernel/activity/BarrierImpl.hpp src/kernel/activity/ConditionVariableImpl.cpp src/kernel/activity/ConditionVariableImpl.hpp src/kernel/activity/CommImpl.cpp @@ -415,12 +407,13 @@ set(SIMIX_SRC src/kernel/actor/ActorImpl.hpp src/kernel/actor/CommObserver.cpp src/kernel/actor/CommObserver.hpp - src/kernel/actor/MutexObserver.cpp - src/kernel/actor/MutexObserver.hpp + src/kernel/actor/Simcall.cpp src/kernel/actor/SimcallObserver.cpp src/kernel/actor/SimcallObserver.hpp - - ${SIMIX_GENERATED_SRC} + src/kernel/actor/SynchroObserver.cpp + src/kernel/actor/SynchroObserver.hpp + src/simix/libsmx.cpp + src/simix/smx_context.cpp ) # Boost context may not be available @@ -562,8 +555,8 @@ set(MC_SRC_BASE set(MC_SRC src/mc/explo/Exploration.hpp src/mc/explo/CommunicationDeterminismChecker.cpp - src/mc/explo/SafetyChecker.cpp - src/mc/explo/SafetyChecker.hpp + src/mc/explo/DFSExplorer.cpp + src/mc/explo/DFSExplorer.hpp src/mc/explo/LivenessChecker.cpp src/mc/explo/LivenessChecker.hpp src/mc/explo/UdporChecker.cpp @@ -638,6 +631,8 @@ set(MC_SRC 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/udpor_global.cpp src/mc/udpor_global.hpp ) @@ -666,7 +661,6 @@ set(headers_to_install include/simgrid/simix.hpp include/simgrid/kernel/ProfileBuilder.hpp include/simgrid/kernel/Timer.hpp - include/simgrid/kernel/future.hpp include/simgrid/disk.h include/simgrid/host.h include/simgrid/link.h @@ -1034,7 +1028,7 @@ set(CMAKEFILES_TXT teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt - teshsuite/smpi/isp/umpire/CMakeLists.txt + teshsuite/smpi/MBI/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -1106,6 +1100,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_stacksetup.c tools/cmake/test_prog/prog_tsan.cpp tools/cmake/cross-mingw.cmake + tools/simgrid-monkey tools/smpi/generate_smpi_defines.pl tools/stack-cleaner/as tools/stack-cleaner/cc