X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85b6c08c26f9da9041c315d3e9cbd4f20f8db9ff..76d4849864c227687e17bdd93c5b1338e9b4cb50:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a0c85b1dbe..caf746ef18 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -6,20 +6,22 @@ set(EXTRA_DIST
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
-  src/include/surf/surf.hpp
   src/include/xbt/coverage.h
   src/include/xbt/parmap.hpp
   src/include/xbt/mmalloc.h
   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
@@ -35,18 +37,12 @@ set(EXTRA_DIST
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
-  src/surf/cpu_interface.hpp
   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
@@ -55,7 +51,6 @@ set(EXTRA_DIST
 
   src/surf/disk_s19.hpp
   src/surf/surf_interface.hpp
-  src/surf/surf_private.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
   src/surf/ptask_L07.hpp
@@ -124,6 +119,7 @@ set(SMPI_SRC
   src/smpi/include/smpi_info.hpp
   src/smpi/include/smpi_keyvals.hpp
   src/smpi/include/smpi_op.hpp
+  src/smpi/include/smpi_replay.hpp
   src/smpi/include/smpi_request.hpp
   src/smpi/include/smpi_status.hpp
   src/smpi/include/smpi_topo.hpp
@@ -309,9 +305,18 @@ set(SURF_SRC
   src/kernel/lmm/maxmin.cpp
 
   src/kernel/resource/Action.cpp
-  src/kernel/resource/Model.cpp
+  src/kernel/resource/CpuImpl.cpp
+  src/kernel/resource/CpuImpl.hpp
   src/kernel/resource/DiskImpl.cpp
   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
@@ -345,17 +350,11 @@ set(SURF_SRC
   src/kernel/EngineImpl.hpp
 
   src/surf/cpu_cas01.cpp
-  src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   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_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
@@ -368,7 +367,6 @@ set(SURF_SRC
 
 set(PLUGINS_SRC
   src/plugins/ProducerConsumer.cpp
-  src/plugins/dirty_page_tracking.cpp
   src/plugins/host_dvfs.cpp
   src/plugins/host_energy.cpp
   src/plugins/link_energy.cpp
@@ -376,12 +374,7 @@ set(PLUGINS_SRC
   src/plugins/host_load.cpp
   src/plugins/link_load.cpp
   src/plugins/file_system/s4u_FileSystem.cpp
-  src/plugins/vm/VirtualMachineImpl.hpp
-  src/plugins/vm/s4u_VirtualMachine.cpp
-  src/plugins/vm/VirtualMachineImpl.hpp
-  src/plugins/vm/VirtualMachineImpl.cpp
-  src/plugins/vm/VmHostExt.hpp
-  src/plugins/vm/VmHostExt.cpp
+  src/plugins/vm/dirty_page_tracking.cpp
   src/plugins/vm/VmLiveMigration.cpp
   src/plugins/vm/VmLiveMigration.hpp
   )
@@ -457,6 +450,7 @@ set(S4U_SRC
   src/s4u/s4u_Mutex.cpp
   src/s4u/s4u_Netzone.cpp
   src/s4u/s4u_Semaphore.cpp
+  src/s4u/s4u_VirtualMachine.cpp
 )
 
 set(SIMGRID_SRC
@@ -474,11 +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(DAG_SRC
+  src/dag/loaders.cpp
   )
 
 set(BINDINGS_SRC
@@ -567,17 +558,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
@@ -638,7 +618,7 @@ set(MC_SRC
   src/mc/sosp/Region.hpp
   src/mc/sosp/Snapshot.hpp
   src/mc/sosp/Snapshot.cpp
-  
+
   src/mc/AddressSpace.hpp
   src/mc/ModelChecker.hpp
   src/mc/ModelChecker.cpp
@@ -684,10 +664,8 @@ set(headers_to_install
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
   include/simgrid/plugins/ProducerConsumer.hpp
-  include/simgrid/smpi/smpi_replay.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
@@ -724,7 +702,6 @@ set(headers_to_install
   include/simgrid/kernel/resource/Action.hpp
   include/simgrid/kernel/resource/NetworkModelIntf.hpp
   include/simgrid/kernel/resource/Model.hpp
-  include/simgrid/kernel/resource/Resource.hpp
 
   include/simgrid/kernel/routing/ClusterZone.hpp
   include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -813,7 +790,7 @@ set(simgrid_sources
   ${XBT_SRC}
   ${PLUGINS_SRC}
   ${BINDINGS_SRC}
-  ${SIMDAG_SRC}
+  ${DAG_SRC}
   )
 
 if(${enable_msg})
@@ -824,12 +801,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()
@@ -839,7 +810,11 @@ if(SIMGRID_HAVE_MC)
 endif()
 
 if(SIMGRID_HAVE_NS3)
+  set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp)
+
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
+else()  
+  set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp)
 endif()
 
 if(SIMGRID_HAVE_LUA)
@@ -855,15 +830,12 @@ set(DOC_SOURCES
   doc/doxygen/inside_cmake.doc
   doc/doxygen/inside_extending.doc
   doc/doxygen/inside_release.doc
-  doc/doxygen/module-sd.doc
   doc/doxygen/module-surf.doc
-  doc/doxygen/module-trace.doc
   doc/doxygen/module-index.doc
   doc/doxygen/outcomes_vizu.doc
   doc/doxygen/platform.doc
   doc/doxygen/uhood.doc
   doc/doxygen/uhood_switch.doc
-  doc/doxygen/uhood_arch.doc
 
   examples/README.rst
 
@@ -910,6 +882,7 @@ set(DOC_SOURCES
   docs/source/img/smpi_simgrid_alltoall_ring_16.png
   docs/source/img/starzone.drawio
   docs/source/img/starzone.svg
+  docs/source/img/vivaldi.svg
   docs/source/img/zone_hierarchy.png
   docs/source/img/zone_tree.drawio
   docs/source/img/zone_tree.svg
@@ -921,6 +894,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
@@ -931,11 +905,11 @@ set(DOC_SOURCES
   docs/source/Installing_SimGrid.rst
   docs/source/Start_your_own_project.rst
   docs/source/Models.rst
+  docs/source/Modeling_howtos.rst
   docs/source/Outcomes.rst
   docs/source/Platform.rst
   docs/source/Platform_cpp.rst
   docs/source/Platform_examples.rst
-  docs/source/Platform_howtos.rst
   docs/source/Platform_routing.rst
   docs/source/Plugins.rst
   docs/source/Release_Notes.rst
@@ -978,6 +952,35 @@ set(DOC_SOURCES
   docs/source/tuto_disk/fig/simgrid_results.png
   docs/source/tuto_disk/init.el
   docs/source/tuto_disk/tuto_disk.cpp
+  docs/source/tuto_network_calibration/clustering_ckmeans.ipynb
+  docs/source/tuto_network_calibration/clustering_dhist.ipynb
+  docs/source/tuto_network_calibration/CMakeLists.txt
+  docs/source/tuto_network_calibration/dahu_platform_ckmeans.cpp
+  docs/source/tuto_network_calibration/dahu_platform_dhist.cpp
+  docs/source/tuto_network_calibration/Dockerfile
+  docs/source/tuto_network_calibration/fig/pingpong_real.drawio
+  docs/source/tuto_network_calibration/fig/pingpong_real.png
+  docs/source/tuto_network_calibration/fig/pingpong_simgrid.drawio
+  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
+  docs/source/tuto_network_calibration/plot_ckmeans_PingPong.png
+  docs/source/tuto_network_calibration/plot_dhist_PingPong.png
+  docs/source/tuto_network_calibration/plot_op_average.png
+  docs/source/tuto_network_calibration/plot_op_raw.png
+  docs/source/tuto_network_calibration/plot_op_segmented.png
+  docs/source/tuto_network_calibration/plot_op_simgrid_ckmeans.png
+  docs/source/tuto_network_calibration/plot_op_simgrid_dhist.png
+  docs/source/tuto_network_calibration/recv_ckmeans.json
+  docs/source/tuto_network_calibration/recv_dhist.json
+  docs/source/tuto_network_calibration/send_ckmeans.json
+  docs/source/tuto_network_calibration/send_dhist.json
+  docs/source/tuto_network_calibration/Utils.cpp
+  docs/source/tuto_network_calibration/Utils.hpp
 
   docs/source/Tutorial_Model-checking.rst
 
@@ -1023,14 +1026,13 @@ set(CMAKEFILES_TXT
   examples/c/CMakeLists.txt
   examples/cpp/CMakeLists.txt
   examples/smpi/CMakeLists.txt
+  examples/smpi/comm_dynamic_costs/CMakeLists.txt
   examples/smpi/NAS/CMakeLists.txt
   examples/smpi/smpi_s4u_masterworker/CMakeLists.txt
   examples/smpi/replay_multiple/CMakeLists.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
@@ -1038,9 +1040,9 @@ set(CMAKEFILES_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
@@ -1126,8 +1128,8 @@ set(CMAKE_SOURCE_FILES
   tools/stack-cleaner/clean-stack-filter
   tools/stack-cleaner/compiler-wrapper
   tools/stack-cleaner/README
-  
-  setup.py 
+
+  setup.py
   MANIFEST.in
   MANIFEST.in.in
   )
@@ -1137,10 +1139,12 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
   examples/platforms/cluster_backbone.xml
+  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
   examples/platforms/cluster_fat_tree.svg
   examples/platforms/cluster_torus.xml
@@ -1154,7 +1158,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
   examples/platforms/model_checker_platform.xml
-  examples/platforms/profiles/bourassa_state.profile
   examples/platforms/profiles/fafard_state.profile
   examples/platforms/profiles/faulty_host.profile
   examples/platforms/profiles/ginette_state.profile