X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97e5210852e84ebe84d8344987fa1b92b1d369fa..928dc2ffdce11b4ce364eda56a602c132ee6cb71:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 3976d7403e..b1f7bf77a3 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -12,7 +12,9 @@ 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/NetworkModel.hpp
   src/kernel/resource/SplitDuplexLinkImpl.hpp
   src/kernel/resource/StandardLinkImpl.hpp
   src/kernel/resource/WifiLinkImpl.hpp
@@ -22,13 +24,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,9 +293,12 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cpp )
 
 set(SURF_SRC
+  src/kernel/lmm/fair_bottleneck.hpp
   src/kernel/lmm/fair_bottleneck.cpp
   src/kernel/lmm/maxmin.hpp
   src/kernel/lmm/maxmin.cpp
+  src/kernel/lmm/System.hpp
+  src/kernel/lmm/System.cpp
 
   src/kernel/resource/Action.cpp
   src/kernel/resource/CpuImpl.cpp
@@ -308,16 +306,14 @@ set(SURF_SRC
   src/kernel/resource/DiskImpl.cpp
   src/kernel/resource/DiskImpl.hpp
   src/kernel/resource/Model.cpp
+  src/kernel/resource/NetworkModel.cpp
   src/kernel/resource/Resource.hpp
-  src/kernel/resource/LinkImpl.cpp
   src/kernel/resource/SplitDuplexLinkImpl.cpp
   src/kernel/resource/StandardLinkImpl.cpp
   src/kernel/resource/VirtualMachineImpl.hpp
   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
@@ -362,9 +358,21 @@ set(SURF_SRC
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
+if (Eigen3_FOUND)
+  set(SURF_SRC
+    ${SURF_SRC}
+    src/kernel/lmm/bmf.hpp
+    src/kernel/lmm/bmf.cpp)
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    src/kernel/lmm/bmf.hpp
+    src/kernel/lmm/bmf.cpp)
+endif()
 
 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 +385,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 +394,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
@@ -409,14 +414,19 @@ set(SIMIX_SRC
   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/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
-
-  ${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
@@ -552,18 +562,18 @@ set(MC_SRC_BASE
   src/mc/mc_config.cpp
   src/mc/mc_config.hpp
   src/mc/mc_global.cpp
-  src/mc/api/Transition.cpp
+  src/mc/transition/Transition.cpp
   )
 
 set(MC_SRC
-  src/mc/checker/Checker.hpp
-  src/mc/checker/CommunicationDeterminismChecker.cpp
-  src/mc/checker/SafetyChecker.cpp
-  src/mc/checker/SafetyChecker.hpp
-  src/mc/checker/LivenessChecker.cpp
-  src/mc/checker/LivenessChecker.hpp
-  src/mc/checker/UdporChecker.cpp
-  src/mc/checker/UdporChecker.hpp
+  src/mc/explo/Exploration.hpp
+  src/mc/explo/CommunicationDeterminismChecker.cpp
+  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
+  src/mc/explo/UdporChecker.hpp
 
   src/mc/inspect/DwarfExpression.hpp
   src/mc/inspect/DwarfExpression.cpp
@@ -627,14 +637,20 @@ set(MC_SRC
   src/mc/mc_exit.hpp
   src/mc/api/State.hpp
   src/mc/api/State.cpp
-  src/mc/api/Transition.hpp
-  src/mc/api/TransitionComm.cpp
-  src/mc/api/TransitionComm.hpp
+  src/mc/transition/Transition.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/udpor_global.cpp
   src/mc/udpor_global.hpp
   )
 
-set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC  src/mc/explo/simgrid_mc.cpp)
 
 set(headers_to_install
   include/simgrid/actor.h
@@ -658,7 +674,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
@@ -798,7 +813,7 @@ if(SIMGRID_HAVE_NS3)
   set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp)
 
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
-else()  
+else()
   set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp)
 endif()
 
@@ -1026,7 +1041,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
@@ -1098,6 +1113,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