X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90741b7a1ae335b53a4d782db8223a5ba9016e1f..220230a3d6da87b71f2e2d09ceaf166d75f3a6a8:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5151ea1def..0f7325bf5c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -6,8 +6,6 @@ set(EXTRA_DIST src/include/mc/datatypes.h src/include/mc/mc.h src/include/simgrid/sg_config.h - src/include/surf/datatypes.hpp - src/include/surf/maxmin.hpp src/include/surf/surf.hpp src/include/xbt/parmap.hpp src/mc/mc_mmu.hpp @@ -44,7 +42,6 @@ set(EXTRA_DIST src/surf/network_ns3.hpp src/surf/network_smpi.hpp src/surf/network_ib.hpp - src/surf/ns3/ns3_interface.hpp src/surf/ns3/ns3_simulator.hpp src/surf/trace_mgr_test.cpp src/surf/xml/simgrid.dtd @@ -68,7 +65,6 @@ set(EXTRA_DIST src/xbt/backtrace_dummy.cpp src/xbt/backtrace_linux.cpp src/xbt/dict_private.h - src/xbt/graph_private.h src/xbt/log_private.h src/xbt/mallocator_private.h @@ -82,6 +78,8 @@ set(EXTRA_DIST src/xbt/mmalloc/mmorecore.c src/xbt/mmalloc/mmprivate.h 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 @@ -279,7 +277,6 @@ set(XBT_SRC src/xbt/parmap.cpp src/xbt/snprintf.c src/xbt/string.cpp - src/xbt/swag.c src/xbt/xbt_log_appender_file.c src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c @@ -301,30 +298,27 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cpp ) set(SURF_SRC + src/kernel/lmm/fair_bottleneck.cpp + src/kernel/lmm/lagrange.cpp + src/kernel/lmm/maxmin.hpp + src/kernel/lmm/maxmin.cpp + + src/kernel/resource/Action.cpp + src/kernel/resource/Model.cpp + src/kernel/resource/Resource.cpp + src/kernel/routing/ClusterZone.cpp - src/kernel/routing/ClusterZone.hpp src/kernel/routing/DijkstraZone.cpp - src/kernel/routing/DijkstraZone.hpp src/kernel/routing/DragonflyZone.cpp - src/kernel/routing/DragonflyZone.hpp src/kernel/routing/EmptyZone.cpp - src/kernel/routing/EmptyZone.hpp src/kernel/routing/FatTreeZone.cpp - src/kernel/routing/FatTreeZone.hpp src/kernel/routing/FloydZone.cpp - src/kernel/routing/FloydZone.hpp src/kernel/routing/FullZone.cpp - src/kernel/routing/FullZone.hpp src/kernel/routing/NetPoint.cpp - src/kernel/routing/NetPoint.hpp src/kernel/routing/NetZoneImpl.cpp - src/kernel/routing/NetZoneImpl.hpp - src/kernel/routing/RoutedZone.cpp - src/kernel/routing/RoutedZone.hpp src/kernel/routing/TorusZone.cpp - src/kernel/routing/TorusZone.hpp + src/kernel/routing/RoutedZone.cpp src/kernel/routing/VivaldiZone.cpp - src/kernel/routing/VivaldiZone.hpp src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp @@ -332,14 +326,13 @@ set(SURF_SRC src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp - src/surf/fair_bottleneck.cpp src/surf/instr_routing.cpp src/surf/instr_surf.cpp - src/surf/lagrange.cpp - src/surf/maxmin.cpp src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp + src/surf/plugins/dirty_page_tracking.cpp + src/surf/plugins/host_dvfs.cpp src/surf/plugins/host_energy.cpp src/surf/plugins/link_energy.cpp src/surf/plugins/host_load.cpp @@ -361,11 +354,15 @@ set(SURF_SRC ) set(PLUGINS_SRC + 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/VmLiveMigration.cpp + src/plugins/vm/VmLiveMigration.hpp ) set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) @@ -395,6 +392,8 @@ set(SIMIX_SRC src/kernel/activity/ExecImpl.hpp src/kernel/activity/MailboxImpl.cpp src/kernel/activity/MailboxImpl.hpp + src/kernel/activity/MutexImpl.cpp + src/kernel/activity/MutexImpl.hpp src/kernel/activity/SleepImpl.cpp src/kernel/activity/SleepImpl.hpp src/kernel/activity/SynchroIo.cpp @@ -424,7 +423,7 @@ set(S4U_SRC src/s4u/s4u_conditionVariable.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp - src/s4u/s4u_file.cpp + src/s4u/s4u_exec.cpp src/s4u/s4u_host.cpp src/s4u/s4u_link.cpp src/s4u/s4u_mailbox.cpp @@ -447,13 +446,10 @@ set(MSG_SRC src/msg/msg_environment.cpp src/msg/msg_global.cpp src/msg/msg_gos.cpp - src/msg/msg_host.cpp - src/msg/msg_io.cpp src/msg/msg_mailbox.cpp src/msg/msg_process.cpp src/msg/msg_synchro.cpp src/msg/msg_task.cpp - src/msg/msg_vm.cpp ) set(SIMDAG_SRC @@ -661,14 +657,16 @@ set(MC_SRC set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install + include/simgrid/chrono.hpp + include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h include/simgrid/plugins/file_system.h + include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h include/simgrid/instr.h include/simgrid/msg.h include/simgrid/simdag.h - include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h @@ -683,7 +681,7 @@ set(headers_to_install include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp include/simgrid/s4u/Engine.hpp - include/simgrid/s4u/File.hpp + include/simgrid/s4u/Exec.hpp include/simgrid/s4u/Host.hpp include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp @@ -692,8 +690,24 @@ set(headers_to_install include/simgrid/s4u/Storage.hpp include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp - include/simgrid/plugins/energy.h - include/simgrid/plugins/load.h + + include/simgrid/kernel/resource/Action.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 + include/simgrid/kernel/routing/DragonflyZone.hpp + include/simgrid/kernel/routing/EmptyZone.hpp + include/simgrid/kernel/routing/FatTreeZone.hpp + include/simgrid/kernel/routing/FloydZone.hpp + include/simgrid/kernel/routing/FullZone.hpp + include/simgrid/kernel/routing/NetPoint.hpp + include/simgrid/kernel/routing/NetZoneImpl.hpp + include/simgrid/kernel/routing/RoutedZone.hpp + include/simgrid/kernel/routing/TorusZone.hpp + include/simgrid/kernel/routing/VivaldiZone.hpp + include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_main.h @@ -701,7 +715,6 @@ set(headers_to_install include/smpi/smpi_extended_traces_fortran.h include/smpi/forward.hpp include/xbt.h - include/xbt/algorithm.hpp include/xbt/asserts.h include/xbt/automaton.h include/xbt/automaton.hpp @@ -736,7 +749,6 @@ set(headers_to_install include/xbt/signal.hpp include/xbt/str.h include/xbt/string.hpp - include/xbt/swag.h include/xbt/synchro.h include/xbt/sysdep.h include/xbt/system_error.hpp @@ -826,6 +838,7 @@ endif() set(DOC_SOURCES doc/Doxyfile.in doc/Layout.xml + doc/graphical-toc.svg doc/sg_thread_model.fig doc/simix.fig doc/surf_nutshell.fig @@ -859,7 +872,8 @@ set(DOC_SOURCES doc/doxygen/install.doc doc/doxygen/install_yours.doc doc/doxygen/java.doc - doc/doxygen/tutorial_msg.doc + doc/tuto-msg/tuto-msg.doc + doc/tuto-msg/overview.svg doc/doxygen/tutorial_smpi.doc doc/doxygen/models.doc doc/doxygen/module-msg.doc @@ -892,17 +906,17 @@ set(DOC_SOURCES doc/manpage/smpirun.1 doc/manpage/tesh.pod - doc/msg-tuto-src/deployment0.xml - doc/msg-tuto-src/deployment1.xml - doc/msg-tuto-src/deployment2.xml - doc/msg-tuto-src/deployment3.xml - doc/msg-tuto-src/deployment_general.xml - doc/msg-tuto-src/Makefile - doc/msg-tuto-src/masterworker0.c - doc/msg-tuto-src/masterworker1.c - doc/msg-tuto-src/masterworker2.c - doc/msg-tuto-src/masterworker3.c - doc/msg-tuto-src/masterworker4.c + doc/tuto-msg/deployment0.xml + doc/tuto-msg/deployment1.xml + doc/tuto-msg/deployment2.xml + doc/tuto-msg/deployment3.xml + doc/tuto-msg/deployment_general.xml + doc/tuto-msg/Makefile + doc/tuto-msg/masterworker.c + doc/tuto-msg/masterworker-sol1.c + doc/tuto-msg/masterworker-sol2.c + doc/tuto-msg/masterworker-sol3.c + doc/tuto-msg/masterworker-sol4.c CITATION.bib )