Rename MutexObserver to SynchroObserver (semaphore incoming)

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index bdfa923..31ca111 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -409,12 +409,16 @@ 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/SimcallObserver.cpp
   src/kernel/actor/SimcallObserver.hpp
+  src/kernel/actor/SynchroObserver.cpp
+  src/kernel/actor/SynchroObserver.hpp
 
   ${SIMIX_GENERATED_SRC}
   )
@@ -552,18 +556,18 @@ set(MC_SRC_BASE
   src/mc/mc_config.cpp
   src/mc/mc_config.hpp
   src/mc/mc_global.cpp
+  src/mc/transition/Transition.cpp
   )
 
 set(MC_SRC
-  src/mc/checker/Checker.hpp
-  src/mc/checker/CommunicationDeterminismChecker.cpp
-  src/mc/checker/CommunicationDeterminismChecker.hpp
-  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/SafetyChecker.cpp
+  src/mc/explo/SafetyChecker.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
@@ -610,7 +614,6 @@ set(MC_SRC
   src/mc/mc_forward.hpp
   src/mc/Session.cpp
   src/mc/Session.hpp
-  src/mc/mc_comm_pattern.hpp
   src/mc/mc_pattern.hpp
   src/mc/compare.cpp
   src/mc/api.cpp
@@ -621,19 +624,27 @@ set(MC_SRC
   src/mc/mc_record.cpp
   src/mc/mc_private.hpp
   src/mc/mc_safety.hpp
-  src/mc/mc_state.hpp
-  src/mc/mc_state.cpp
   src/mc/VisitedState.cpp
   src/mc/VisitedState.hpp
   src/mc/mc_client_api.cpp
   src/mc/mc_smx.cpp
   src/mc/mc_exit.hpp
-  src/mc/Transition.hpp
+  src/mc/api/State.hpp
+  src/mc/api/State.cpp
+  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
@@ -898,7 +909,7 @@ set(DOC_SOURCES
   docs/source/tuto_s4u/deployment1.xml
   docs/source/tuto_s4u/deployment2.xml
   docs/source/tuto_s4u/deployment3.xml
-  docs/source/tuto_s4u/deployment4.xml
+  docs/source/tuto_s4u/deployment5.xml
   docs/source/tuto_s4u/draw_gantt.R
   docs/source/tuto_s4u/img/intro.svg
   docs/source/tuto_s4u/img/question.svg
@@ -906,7 +917,9 @@ set(DOC_SOURCES
   docs/source/tuto_s4u/img/Rscript-screenshot.png
   docs/source/tuto_s4u/img/vite-screenshot.png
   docs/source/tuto_s4u/master-workers-lab1.cpp
+  docs/source/tuto_s4u/master-workers-lab1.py
   docs/source/tuto_s4u/master-workers-lab2.cpp
+  docs/source/tuto_s4u/master-workers-lab2.py
   docs/source/tuto_s4u/master-workers-lab3.cpp
   docs/source/tuto_s4u/master-workers-lab4.cpp
 
@@ -942,7 +955,6 @@ set(DOC_SOURCES
   docs/source/tuto_network_calibration/fig/pingpong_simgrid.png
   docs/source/tuto_network_calibration/isend_ckmeans.json
   docs/source/tuto_network_calibration/isend_dhist.json
-  docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb
   docs/source/tuto_network_calibration/network_calibration_tutorial.rst
   docs/source/tuto_network_calibration/pingpong_ckmeans.json
   docs/source/tuto_network_calibration/pingpong_dhist.json
@@ -1163,12 +1175,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
   examples/platforms/routing_cluster.cpp
-  examples/platforms/routing_none.xml
   examples/platforms/simulacrum_7_hosts.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
   examples/platforms/small_platform.xml
-  examples/platforms/small_platform_constant.xml
+  examples/platforms/small_platform_routing_none.xml
   examples/platforms/small_platform_failures.xml
   examples/platforms/small_platform_fatpipe.xml
   examples/platforms/small_platform_one_link_routes.xml