X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/178d93b55be5105559c7b8277838b44944e3ad8c..05eead638cfd02a6d5a218939e226eb1700fd8a5:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 25525840c2..9675b039a9 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -10,6 +10,7 @@ set(EXTRA_DIST 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/mc/mc_mmu.hpp @@ -51,8 +52,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 +77,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 +127,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 @@ -299,7 +291,6 @@ set(XBT_SRC src/xbt/xbt_replay.cpp src/xbt/xbt_str.cpp src/xbt/xbt_virtu.cpp - src/xbt_modinter.h ) if(HAVE_MMALLOC) @@ -318,7 +309,6 @@ set(SURF_SRC src/kernel/resource/Action.cpp src/kernel/resource/Model.cpp - src/kernel/resource/Resource.cpp src/kernel/resource/DiskImpl.cpp src/kernel/resource/DiskImpl.hpp @@ -341,11 +331,14 @@ set(SURF_SRC src/kernel/routing/FullZone.cpp src/kernel/routing/NetPoint.cpp src/kernel/routing/NetZoneImpl.cpp - src/kernel/routing/TorusZone.cpp src/kernel/routing/RoutedZone.cpp + src/kernel/routing/StarZone.cpp + src/kernel/routing/TorusZone.cpp src/kernel/routing/VivaldiZone.cpp src/kernel/routing/WifiZone.cpp + src/kernel/timer/Timer.cpp + src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp @@ -358,8 +351,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,6 +363,7 @@ 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 @@ -428,6 +420,8 @@ set(SIMIX_SRC src/kernel/activity/SynchroRaw.hpp src/kernel/actor/ActorImpl.cpp src/kernel/actor/ActorImpl.hpp + src/kernel/actor/SimcallObserver.cpp + src/kernel/actor/SimcallObserver.hpp ${SIMIX_GENERATED_SRC} ) @@ -461,7 +455,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 @@ -499,8 +492,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 @@ -515,15 +506,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 @@ -535,8 +523,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 @@ -592,7 +578,7 @@ set(JEDULE_SRC set(MC_SRC_BASE src/mc/mc_base.cpp - src/mc/mc_base.h + src/mc/mc_base.hpp src/mc/mc_record.hpp src/mc/mc_replay.hpp src/mc/mc_record.cpp @@ -602,15 +588,15 @@ 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 src/mc/checker/SafetyChecker.cpp src/mc/checker/SafetyChecker.hpp - 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 @@ -637,11 +623,10 @@ set(MC_SRC src/mc/remote/Channel.hpp src/mc/remote/CheckerSide.cpp src/mc/remote/CheckerSide.hpp - src/mc/remote/RemoteSimulation.hpp - src/mc/remote/RemoteSimulation.cpp + src/mc/remote/RemoteProcess.hpp + src/mc/remote/RemoteProcess.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 @@ -658,28 +643,27 @@ 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/mc_api.cpp - src/mc/mc_api.hpp + 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_private.hpp - src/mc/mc_request.hpp - src/mc/mc_request.cpp 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.hpp 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) @@ -697,8 +681,8 @@ 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/plugins/ProducerConsumer.hpp + include/simgrid/smpi/smpi_replay.hpp include/simgrid/instr.h include/simgrid/mailbox.h include/simgrid/simdag.h @@ -706,7 +690,7 @@ set(headers_to_install include/simgrid/forward.h include/simgrid/simix.h include/simgrid/simix.hpp - include/simgrid/simix/blocking_simcall.hpp + include/simgrid/kernel/Timer.hpp include/simgrid/kernel/future.hpp include/simgrid/disk.h include/simgrid/host.h @@ -714,7 +698,6 @@ set(headers_to_install 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 @@ -732,11 +715,11 @@ 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 include/simgrid/kernel/resource/Action.hpp + include/simgrid/kernel/resource/NetworkModelIntf.hpp include/simgrid/kernel/resource/Model.hpp include/simgrid/kernel/resource/Resource.hpp @@ -750,6 +733,7 @@ set(headers_to_install include/simgrid/kernel/routing/NetPoint.hpp include/simgrid/kernel/routing/NetZoneImpl.hpp include/simgrid/kernel/routing/RoutedZone.hpp + include/simgrid/kernel/routing/StarZone.hpp include/simgrid/kernel/routing/TorusZone.hpp include/simgrid/kernel/routing/VivaldiZone.hpp include/simgrid/kernel/routing/WifiZone.hpp @@ -778,7 +762,6 @@ set(headers_to_install include/xbt/file.hpp include/xbt/functional.hpp include/xbt/function_types.h - include/xbt/future.hpp include/xbt/graph.h include/xbt/log.h include/xbt/log.hpp @@ -788,13 +771,13 @@ set(headers_to_install include/xbt/PropertyHolder.hpp include/xbt/parmap.h include/xbt/parse_units.hpp + include/xbt/promise.hpp include/xbt/range.hpp include/xbt/random.hpp include/xbt/replay.hpp include/xbt/signal.hpp include/xbt/str.h include/xbt/string.hpp - include/xbt/synchro.h include/xbt/sysdep.h include/xbt/system_error.hpp include/xbt/utility.hpp @@ -863,9 +846,6 @@ else() endif() set(DOC_SOURCES - doc/Doxyfile.in - doc/Layout.xml - doc/doxygen/FAQ.doc doc/doxygen/inside.doc doc/doxygen/inside_tests.doc @@ -877,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 @@ -895,12 +874,13 @@ set(DOC_SOURCES docs/manpages/tesh.pod docs/Build.sh + docs/README.md + docs/bin/extract_logs_hierarchy.pl docs/requirements.txt docs/source/conf.py docs/source/Doxyfile docs/find-missing.ignore docs/find-missing.py - docs/source/_ext/autodoxy.py docs/source/_ext/showfile.css docs/source/_ext/showfile.js docs/source/_ext/showfile.py @@ -934,23 +914,25 @@ 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 - docs/source/Experimental_Setup.rst + docs/source/Deploying_your_application.rst + docs/source/Experimental_setup.rst docs/source/index.rst + docs/source/intl.rst docs/source/Introduction.rst docs/source/Installing_SimGrid.rst - docs/source/Start_Your_Own_Project.rst - docs/source/models.rst - docs/source/ns3.rst - docs/source/outcomes.rst - docs/source/platform.rst - docs/source/Platform_Examples.rst - docs/source/platform_howtos.rst - docs/source/Platform_Routing.rst + docs/source/Start_your_own_project.rst + docs/source/Models.rst + docs/source/Outcomes.rst + docs/source/Platform.rst + docs/source/Platform_examples.rst + docs/source/Platform_howtos.rst + docs/source/Platform_routing.rst docs/source/Plugins.rst - docs/source/XML_Reference.rst + docs/source/XML_reference.rst + docs/source/Design_goals.rst docs/source/Tutorial_Algorithms.rst docs/source/tuto_s4u/deployment1.xml @@ -976,17 +958,12 @@ set(DOC_SOURCES docs/source/tuto_smpi/gemm_mpi.cpp docs/source/tuto_smpi/roundtrip.c - CITATION.bib - ) + docs/source/Tutorial_Model-checking.rst -set(DOC_FIGS - ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig - ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig + CITATION.bib ) set(DOC_TOOLS - tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/xbt_log_extract_hierarchy.pl tools/doxygen/list_routing_models_examples.sh ) @@ -995,16 +972,7 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/storage_sample_scenario.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png ) set(bin_files @@ -1030,8 +998,9 @@ 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/platforms/CMakeLists.txt examples/c/CMakeLists.txt - examples/s4u/CMakeLists.txt + examples/cpp/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_s4u_masterworker/CMakeLists.txt @@ -1039,7 +1008,6 @@ set(CMAKEFILES_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 @@ -1047,11 +1015,11 @@ set(CMAKEFILES_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 @@ -1190,14 +1158,15 @@ 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 + 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/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform.lua examples/platforms/small_platform_constant.xml @@ -1218,6 +1187,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/two_peers.xml examples/platforms/vivaldi.xml examples/platforms/wifi_energy.xml + examples/platforms/wifi_ns3.xml examples/platforms/wifi.xml )