X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b69fae1b624d9a739068fc9629953fc2044c3dd..ebadbf7894190d4c66238842db5f8931adb7df5b:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index c0f2055ae5..9750bf5607 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -12,13 +12,16 @@ set(EXTRA_DIST
   src/include/xbt/xbt_modinter.h
   src/include/catch.hpp
   src/include/xxhash.hpp
+  src/kernel/resource/LinkImpl.hpp
+  src/kernel/resource/SplitDuplexLinkImpl.hpp
+  src/kernel/resource/StandardLinkImpl.hpp
+  src/kernel/resource/WifiLinkImpl.hpp
   src/mc/mc_mmu.hpp
   src/mc/mc_record.hpp
   src/msg/msg_private.hpp
-  src/simdag/dax.dtd
-  src/simdag/dax_dtd.c
-  src/simdag/dax_dtd.h
-  src/simdag/simdag_private.hpp
+  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
@@ -37,14 +40,9 @@ set(EXTRA_DIST
   src/surf/cpu_ti.hpp
   src/surf/network_cm02.hpp
   src/surf/network_constant.hpp
-  src/surf/network_interface.hpp
-  src/surf/LinkImpl.hpp
-  src/surf/LinkImplIntf.hpp
-  src/surf/SplitDuplexLinkImpl.hpp
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
-  src/surf/network_wifi.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
@@ -76,8 +74,6 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mrealloc.c
   src/xbt/mmalloc/swag.c
   src/xbt/mmalloc/swag.h
-  tools/lualib.patch
-  teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   )
 
@@ -313,8 +309,12 @@ set(SURF_SRC
   src/kernel/resource/DiskImpl.hpp
   src/kernel/resource/Model.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
@@ -352,10 +352,6 @@ set(SURF_SRC
   src/surf/disk_s19.cpp
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
-  src/surf/network_interface.cpp
-  src/surf/LinkImpl.cpp
-  src/surf/SplitDuplexLinkImpl.cpp
-  src/surf/network_wifi.cpp
   src/surf/sg_platf.cpp
   src/surf/surf_interface.cpp
   src/surf/xml/platf.hpp
@@ -413,10 +409,12 @@ 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
 
@@ -470,17 +468,8 @@ set(MSG_SRC
   src/msg/msg_task.cpp
   )
 
-set(SIMDAG_SRC
-  src/simdag/sd_daxloader.cpp
-  src/simdag/sd_dotloader.cpp
-  src/simdag/sd_global.cpp
-  src/simdag/sd_task.cpp
-  )
-
-set(BINDINGS_SRC
-  src/bindings/lua/lua_private.hpp
-  src/bindings/lua/lua_utils.hpp
-  src/bindings/lua/simgrid_lua.hpp
+set(DAG_SRC
+  src/dag/loaders.cpp
   )
 
 set(JMSG_C_SRC
@@ -538,13 +527,6 @@ set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java)
 list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
-set(LUA_SRC
-  src/bindings/lua/lua_host.cpp
-  src/bindings/lua/lua_platf.cpp
-  src/bindings/lua/lua_utils.cpp
-  src/bindings/lua/simgrid_lua.cpp
-  )
-
 set(TRACING_SRC
   src/instr/instr_config.cpp
   src/instr/instr_interface.cpp
@@ -563,17 +545,6 @@ set(TRACING_SRC
   src/instr/instr_resource_utilization.cpp
   )
 
-set(JEDULE_SRC
-  include/simgrid/jedule/jedule_events.hpp
-  include/simgrid/jedule/jedule.hpp
-  include/simgrid/jedule/jedule_platform.hpp
-  include/simgrid/jedule/jedule_sd_binding.h
-  src/instr/jedule/jedule_events.cpp
-  src/instr/jedule/jedule.cpp
-  src/instr/jedule/jedule_platform.cpp
-  src/instr/jedule/jedule_sd_binding.cpp
-  )
-
 set(MC_SRC_BASE
   src/mc/mc_base.cpp
   src/mc/mc_base.hpp
@@ -583,18 +554,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
@@ -641,7 +612,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
@@ -652,19 +622,25 @@ 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/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
@@ -682,7 +658,6 @@ set(headers_to_install
   include/simgrid/plugins/ProducerConsumer.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
-  include/simgrid/simdag.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
   include/simgrid/simix.h
@@ -806,8 +781,7 @@ set(simgrid_sources
   ${TRACING_SRC}
   ${XBT_SRC}
   ${PLUGINS_SRC}
-  ${BINDINGS_SRC}
-  ${SIMDAG_SRC}
+  ${DAG_SRC}
   )
 
 if(${enable_msg})
@@ -818,12 +792,6 @@ else()
                                                 ${MSG_SRC})
 endif()
 
-if(${SIMGRID_HAVE_JEDULE})
-  set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
-else()
-  set(EXTRA_DIST       ${EXTRA_DIST}       ${JEDULE_SRC})
-endif()
-
 if(enable_smpi)
   set(simgrid_sources  ${simgrid_sources}  ${SMPI_SRC})
 endif()
@@ -840,12 +808,6 @@ else()
   set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp)
 endif()
 
-if(SIMGRID_HAVE_LUA)
-  set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
-else()
-  set(EXTRA_DIST       ${EXTRA_DIST}       ${LUA_SRC})
-endif()
-
 set(DOC_SOURCES
   doc/doxygen/FAQ.doc
   doc/doxygen/inside.doc
@@ -917,6 +879,7 @@ set(DOC_SOURCES
   docs/source/app_s4u.rst
   docs/source/app_smpi.rst
   docs/source/The_XBT_toolbox.rst
+  docs/source/Calibrating_the_models.rst
   docs/source/community.rst
   docs/source/Configuring_SimGrid.rst
   docs/source/Deploying_your_application.rst
@@ -942,7 +905,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
@@ -950,7 +913,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
 
@@ -986,7 +951,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
@@ -1055,18 +1019,15 @@ set(CMAKEFILES_TXT
   examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
   examples/python/CMakeLists.txt
   examples/deprecated/java/CMakeLists.txt
-  examples/deprecated/msg/mc/CMakeLists.txt
-  examples/deprecated/simdag/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   teshsuite/kernel/CMakeLists.txt
-  teshsuite/lua/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/models/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
+  teshsuite/platforms/CMakeLists.txt
   teshsuite/python/CMakeLists.txt
   teshsuite/s4u/CMakeLists.txt
-  teshsuite/simdag/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
@@ -1129,7 +1090,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindLibelf.cmake
   tools/cmake/Modules/FindLibunwind.cmake
   tools/cmake/Modules/FindLibevent.cmake
-  tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
   tools/cmake/Modules/pybind11Config.cmake
@@ -1166,7 +1126,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster_backbone.svg
   examples/platforms/cluster_multi.xml
   examples/platforms/cluster_and_one_host.xml
-  examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_crossbar.xml
   examples/platforms/cluster_crossbar.svg
   examples/platforms/cluster_fat_tree.xml
@@ -1196,6 +1155,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/profiles/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/dogbone.xml
+  examples/platforms/energy_boot.xml
   examples/platforms/energy_platform.xml
   examples/platforms/energy_cluster.xml
   examples/platforms/faulty_host.xml
@@ -1210,15 +1170,12 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/ptask_L07.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
-  examples/platforms/routing_cluster.lua
   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.lua
-  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