Start to replace old simdag tests of the ptask_L07 model

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4d56637..ee1750d 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -24,7 +24,7 @@ set(EXTRA_DIST
   src/simix/popping_private.hpp
   src/simix/popping_bodies.cpp
   src/simix/popping_generated.cpp
-  src/simix/popping_enum.h
+  src/simix/popping_enum.hpp
   src/simix/popping_accessors.hpp
   src/simix/smx_private.hpp
   src/smpi/colls/coll_tuned_topo.hpp
@@ -51,8 +51,6 @@ set(EXTRA_DIST
   src/surf/xml/surfxml_sax_cb.cpp
 
   src/surf/disk_s19.hpp
-  src/surf/StorageImpl.hpp
-  src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.hpp
   src/surf/host_clm03.hpp
@@ -78,14 +76,10 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mrealloc.c
   src/xbt/mmalloc/swag.c
   src/xbt/mmalloc/swag.h
-  tools/tesh/generate_tesh
   tools/lualib.patch
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
-
-  examples/deprecated/java/.classpath
-  examples/deprecated/java/.project
   )
 
 set(SMPI_SRC
@@ -132,13 +126,10 @@ set(SMPI_SRC
   src/smpi/include/smpi_status.hpp
   src/smpi/include/smpi_topo.hpp
   src/smpi/include/smpi_win.hpp
-  src/smpi/plugins/sampi_loadbalancer.cpp
   src/smpi/plugins/ampi/ampi.cpp
   src/smpi/plugins/ampi/ampi.hpp
   src/smpi/plugins/ampi/instr_ampi.cpp
   src/smpi/plugins/ampi/instr_ampi.hpp
-  src/smpi/plugins/load_balancer/LoadBalancer.cpp
-  src/smpi/plugins/load_balancer/load_balancer.hpp
   src/surf/network_smpi.cpp
   src/surf/network_ib.cpp
   src/smpi/bindings/smpi_mpi.cpp
@@ -156,6 +147,7 @@ set(SMPI_SRC
   src/smpi/bindings/smpi_f77.cpp
   src/smpi/bindings/smpi_f77_coll.cpp
   src/smpi/bindings/smpi_f77_comm.cpp
+  src/smpi/bindings/smpi_f77_file.cpp
   src/smpi/bindings/smpi_f77_request.cpp
   src/smpi/bindings/smpi_f77_type.cpp
   src/smpi/colls/smpi_coll.cpp
@@ -293,8 +285,8 @@ set(XBT_SRC
   src/xbt/xbt_log_layout_simple.cpp
   src/xbt/xbt_main.cpp
   src/xbt/xbt_os_file.cpp
-  src/xbt/xbt_os_synchro.cpp
   src/xbt/xbt_os_time.c
+  src/xbt/xbt_parse_units.cpp
   src/xbt/xbt_replay.cpp
   src/xbt/xbt_str.cpp
   src/xbt/xbt_virtu.cpp
@@ -328,6 +320,8 @@ set(SURF_SRC
   src/kernel/resource/profile/FutureEvtSet.hpp
   src/kernel/resource/profile/Profile.cpp
   src/kernel/resource/profile/Profile.hpp
+  src/kernel/resource/profile/StochasticDatedValue.cpp
+  src/kernel/resource/profile/StochasticDatedValue.hpp
 
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/DijkstraZone.cpp
@@ -341,6 +335,7 @@ set(SURF_SRC
   src/kernel/routing/TorusZone.cpp
   src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp
+  src/kernel/routing/WifiZone.cpp
 
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
@@ -354,8 +349,6 @@ set(SURF_SRC
   src/surf/network_interface.cpp
   src/surf/network_wifi.cpp
   src/surf/sg_platf.cpp
-  src/surf/StorageImpl.cpp
-  src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/xml/platf.hpp
@@ -372,7 +365,9 @@ set(PLUGINS_SRC
   src/plugins/host_dvfs.cpp
   src/plugins/host_energy.cpp
   src/plugins/link_energy.cpp
+  src/plugins/link_energy_wifi.cpp
   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
@@ -455,7 +450,6 @@ set(S4U_SRC
   src/s4u/s4u_Mutex.cpp
   src/s4u/s4u_Netzone.cpp
   src/s4u/s4u_Semaphore.cpp
-  src/s4u/s4u_Storage.cpp
 )
 
 set(SIMGRID_SRC
@@ -493,8 +487,6 @@ set(JMSG_C_SRC
   src/bindings/java/jmsg_as.hpp
   src/bindings/java/jmsg_comm.cpp
   src/bindings/java/jmsg_comm.h
-  src/bindings/java/jmsg_file.cpp
-  src/bindings/java/jmsg_file.h
   src/bindings/java/jmsg_host.cpp
   src/bindings/java/jmsg_host.h
   src/bindings/java/jmsg_process.cpp
@@ -509,15 +501,12 @@ set(JMSG_C_SRC
   src/bindings/java/jxbt_utilities.hpp
   src/bindings/java/JavaContext.cpp
   src/bindings/java/JavaContext.hpp
-  src/bindings/java/jmsg_storage.cpp
-  src/bindings/java/jmsg_storage.h
 )
 
 set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/NativeLib.java
   src/bindings/java/org/simgrid/msg/As.java
   src/bindings/java/org/simgrid/msg/Comm.java
-  src/bindings/java/org/simgrid/msg/File.java
   src/bindings/java/org/simgrid/msg/Host.java
   src/bindings/java/org/simgrid/msg/HostFailureException.java
   src/bindings/java/org/simgrid/msg/HostNotFoundException.java
@@ -529,8 +518,6 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/ProcessKilledError.java
   src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
   src/bindings/java/org/simgrid/msg/Semaphore.java
-  src/bindings/java/org/simgrid/msg/Storage.java
-  src/bindings/java/org/simgrid/msg/StorageNotFoundException.java
   src/bindings/java/org/simgrid/msg/Task.java
   src/bindings/java/org/simgrid/msg/TaskCancelledException.java
   src/bindings/java/org/simgrid/msg/TimeoutException.java
@@ -566,7 +553,6 @@ set(TRACING_SRC
   src/instr/instr_paje_trace.cpp
   src/instr/instr_paje_types.cpp
   src/instr/instr_paje_types.hpp
-  src/instr/instr_paje_values.cpp
   src/instr/instr_paje_values.hpp
   src/instr/instr_platform.cpp
   src/instr/instr_private.hpp
@@ -597,7 +583,6 @@ set(MC_SRC_BASE
   )
 
 set(MC_SRC
-  src/mc/checker/Checker.cpp
   src/mc/checker/Checker.hpp
   src/mc/checker/CommunicationDeterminismChecker.cpp
   src/mc/checker/CommunicationDeterminismChecker.hpp
@@ -606,7 +591,9 @@ set(MC_SRC
   src/mc/checker/SimcallInspector.hpp
   src/mc/checker/LivenessChecker.cpp
   src/mc/checker/LivenessChecker.hpp
-  
+  src/mc/checker/UdporChecker.cpp
+  src/mc/checker/UdporChecker.hpp
+
   src/mc/inspect/DwarfExpression.hpp
   src/mc/inspect/DwarfExpression.cpp
   src/mc/inspect/Frame.hpp
@@ -626,15 +613,16 @@ set(MC_SRC
   src/mc/inspect/mc_unw.cpp
   src/mc/inspect/mc_unw_vmread.cpp
 
+  src/mc/remote/AppSide.cpp
+  src/mc/remote/AppSide.hpp
   src/mc/remote/Channel.cpp
   src/mc/remote/Channel.hpp
-  src/mc/remote/Client.cpp
-  src/mc/remote/Client.hpp
-  src/mc/remote/RemoteClient.hpp
-  src/mc/remote/RemoteClient.cpp
+  src/mc/remote/CheckerSide.cpp
+  src/mc/remote/CheckerSide.hpp
+  src/mc/remote/RemoteSimulation.hpp
+  src/mc/remote/RemoteSimulation.cpp
   src/mc/remote/RemotePtr.hpp
   src/mc/remote/mc_protocol.h
-  src/mc/remote/mc_protocol.cpp
 
   src/mc/sosp/PageStore.hpp
   src/mc/sosp/PageStore.cpp
@@ -651,14 +639,15 @@ set(MC_SRC
   src/mc/mc_forward.hpp
   src/mc/Session.cpp
   src/mc/Session.hpp
-  src/mc/mc_comm_pattern.cpp
   src/mc/mc_comm_pattern.hpp
+  src/mc/mc_pattern.hpp
   src/mc/compare.cpp
+  src/mc/api.cpp
+  src/mc/api.hpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.hpp
   src/mc/mc_record.cpp
-  src/mc/mc_memory.cpp
   src/mc/mc_private.hpp
   src/mc/mc_request.hpp
   src/mc/mc_request.cpp
@@ -672,6 +661,8 @@ set(MC_SRC
   src/mc/mc_smx.cpp
   src/mc/mc_exit.hpp
   src/mc/Transition.hpp
+  src/mc/udpor_global.cpp
+  src/mc/udpor_global.hpp
   )
 
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
@@ -679,7 +670,9 @@ set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 set(headers_to_install
   include/simgrid/actor.h
   include/simgrid/barrier.h
+  include/simgrid/comm.h
   include/simgrid/engine.h
+  include/simgrid/exec.h
   include/simgrid/Exception.hpp
   include/simgrid/chrono.hpp
   include/simgrid/plugins/dvfs.h
@@ -687,11 +680,9 @@ set(headers_to_install
   include/simgrid/plugins/file_system.h
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
-  include/simgrid/plugins/load_balancer.h
   include/simgrid/smpi/replay.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
-  include/simgrid/msg.h
   include/simgrid/simdag.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
@@ -699,12 +690,12 @@ set(headers_to_install
   include/simgrid/simix.hpp
   include/simgrid/simix/blocking_simcall.hpp
   include/simgrid/kernel/future.hpp
+  include/simgrid/disk.h
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/cond.h
   include/simgrid/mutex.h
   include/simgrid/semaphore.h
-  include/simgrid/storage.h
   include/simgrid/vm.h
   include/simgrid/zone.h
   include/simgrid/s4u/Activity.hpp
@@ -722,7 +713,6 @@ set(headers_to_install
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/NetZone.hpp
   include/simgrid/s4u/Semaphore.hpp
-  include/simgrid/s4u/Storage.hpp
   include/simgrid/s4u/VirtualMachine.hpp
   include/simgrid/s4u.hpp
 
@@ -742,6 +732,7 @@ set(headers_to_install
   include/simgrid/kernel/routing/RoutedZone.hpp
   include/simgrid/kernel/routing/TorusZone.hpp
   include/simgrid/kernel/routing/VivaldiZone.hpp
+  include/simgrid/kernel/routing/WifiZone.hpp
 
   include/smpi/mpi.h
   include/smpi/sampi.h
@@ -776,6 +767,7 @@ set(headers_to_install
   include/xbt/module.h
   include/xbt/PropertyHolder.hpp
   include/xbt/parmap.h
+  include/xbt/parse_units.hpp
   include/xbt/range.hpp
   include/xbt/random.hpp
   include/xbt/replay.hpp
@@ -795,7 +787,7 @@ set(source_of_generated_headers
   src/internal_config.h.in
   include/smpi/mpif.h.in)
 
-### depend of some variables setted upper
+### depend of some variables set upper
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
   set(SIMIX_SRC    ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp
                                 src/kernel/context/ContextUnix.cpp)
@@ -818,10 +810,12 @@ set(simgrid_sources
   ${SIMDAG_SRC}
   )
 
-if(${enable_MSG})
-  set(simgrid_sources ${simgrid_sources}   ${MSG_SRC})
+if(${enable_msg})
+  set(headers_to_install ${headers_to_install}  include/simgrid/msg.h)
+  set(simgrid_sources    ${simgrid_sources}     ${MSG_SRC})
 else()
-  set(EXTRA_DIST      ${EXTRA_DIST}        ${MSG_SRC})
+  set(EXTRA_DIST         ${EXTRA_DIST}          include/simgrid/msg.h
+                                                ${MSG_SRC})
 endif()
 
 if(${SIMGRID_HAVE_JEDULE})
@@ -863,7 +857,6 @@ set(DOC_SOURCES
   doc/doxygen/module-trace.doc
   doc/doxygen/module-xbt.doc
   doc/doxygen/module-index.doc
-  doc/doxygen/outcomes_logs.doc
   doc/doxygen/outcomes_vizu.doc
   doc/doxygen/platform.doc
   doc/doxygen/platform_lua.doc
@@ -881,6 +874,7 @@ set(DOC_SOURCES
   docs/manpages/tesh.pod
 
   docs/Build.sh
+  docs/bin/extract_logs_hierarchy.pl
   docs/requirements.txt
   docs/source/conf.py
   docs/source/Doxyfile
@@ -890,6 +884,21 @@ set(DOC_SOURCES
   docs/source/_ext/showfile.css
   docs/source/_ext/showfile.js
   docs/source/_ext/showfile.py
+  docs/source/_ext/javasphinx/LICENSE
+  docs/source/_ext/javasphinx/MANIFEST.in
+  docs/source/_ext/javasphinx/README.md
+  docs/source/_ext/javasphinx/doc/conf.py
+  docs/source/_ext/javasphinx/doc/index.rst
+  docs/source/_ext/javasphinx/javasphinx/__init__.py
+  docs/source/_ext/javasphinx/javasphinx/apidoc.py
+  docs/source/_ext/javasphinx/javasphinx/compiler.py
+  docs/source/_ext/javasphinx/javasphinx/domain.py
+  docs/source/_ext/javasphinx/javasphinx/extdoc.py
+  docs/source/_ext/javasphinx/javasphinx/formatter.py
+  docs/source/_ext/javasphinx/javasphinx/htmlrst.py
+  docs/source/_ext/javasphinx/javasphinx/util.py
+  docs/source/_ext/javasphinx/setup.py
+  docs/source/_static/css/custom.css
   docs/source/_templates/breadcrumbs.html
 
   docs/source/img/eclipseScreenShot.png
@@ -905,6 +914,7 @@ set(DOC_SOURCES
   docs/source/app_msg.rst
   docs/source/app_s4u.rst
   docs/source/app_smpi.rst
+  docs/source/The_XBT_toolbox.rst
   docs/source/community.rst
   docs/source/Configuring_SimGrid.rst
   docs/source/Deploying_your_Application.rst
@@ -950,14 +960,7 @@ set(DOC_SOURCES
   CITATION.bib
   )
 
-set(DOC_FIGS
-  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
-  ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
-  )
-
 set(DOC_TOOLS
-  tools/doxygen/fig2dev_postprocessor.pl
-  tools/doxygen/xbt_log_extract_hierarchy.pl
   tools/doxygen/list_routing_models_examples.sh
   )
 
@@ -1001,26 +1004,27 @@ set(txt_files
 # The list of cmake build directories is constructed from the following list.
 # Add your CMakeLists file here to see your subdir built.
 set(CMAKEFILES_TXT
-  examples/s4u/CMakeLists.txt
+  examples/c/CMakeLists.txt
+  examples/cpp/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/smpi/NAS/CMakeLists.txt
-  examples/smpi/smpi_s4u_masterslave/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/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/python/CMakeLists.txt
   teshsuite/s4u/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
-  teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
@@ -1113,7 +1117,7 @@ set(CMAKE_SOURCE_FILES
   )
 
 set(PLATFORMS_EXAMPLES
-  examples/platforms/bypassASroute.xml
+  examples/platforms/bypassZoneRoute.xml
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
   examples/platforms/cluster_backbone.xml
@@ -1133,6 +1137,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/optorsim/transform_optorsim_platform.pl
   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
@@ -1158,6 +1163,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/multicore_machine.xml
   examples/platforms/ns3-big-cluster.xml
   examples/platforms/onelink.xml
+  examples/platforms/ptask_L07.xml
   examples/platforms/prop.xml
   examples/platforms/routing_cluster.xml
   examples/platforms/routing_cluster.lua
@@ -1165,8 +1171,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/simulacrum_7_hosts.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
-  examples/platforms/storage/remote_io.xml
-  examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml
   examples/platforms/small_platform.lua
   examples/platforms/small_platform_constant.xml
@@ -1186,6 +1190,8 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/two_hosts_platform_with_availability_included.xml
   examples/platforms/two_peers.xml
   examples/platforms/vivaldi.xml
+  examples/platforms/wifi_energy.xml
+  examples/platforms/wifi_ns3.xml
   examples/platforms/wifi.xml
   )