X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/968499473499987433444f45637b875cbba8e67c..b8253e68725ba0f4f15a07fd04bf2ed2b12236c8:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 510bb81c52..588be4aaaa 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -2,17 +2,14 @@ set(EXTRA_DIST src/bindings/java/MANIFEST.in - src/include/instr/instr_interface.h src/include/mc/datatypes.h src/include/mc/mc.h - src/include/simgrid/sg_config.h - src/include/surf/datatypes.h - src/include/surf/maxmin.hpp + src/include/simgrid/sg_config.hpp src/include/surf/surf.hpp src/include/xbt/parmap.hpp + src/include/xbt/mmalloc.h src/mc/mc_mmu.hpp src/mc/mc_record.hpp - src/mc/PageStore.hpp src/msg/msg_private.hpp src/simdag/dax.dtd src/simdag/dax_dtd.c @@ -38,16 +35,16 @@ set(EXTRA_DIST src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp src/surf/cpu_ti.hpp - src/surf/maxmin_private.hpp src/surf/network_cm02.hpp src/surf/network_constant.hpp src/surf/network_interface.hpp 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/mc/sosp/mc_snapshot_test.cpp + src/mc/sosp/PageStore_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c @@ -69,7 +66,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 @@ -83,12 +79,14 @@ 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 examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh - + examples/java/.classpath examples/java/.project ) @@ -224,7 +222,7 @@ set(SMPI_SRC src/smpi/internals/smpi_deployment.cpp src/smpi/internals/smpi_dvfs.cpp src/smpi/internals/smpi_global.cpp - src/smpi/internals/SmpiHost.cpp + src/smpi/internals/smpi_host.cpp src/smpi/internals/smpi_replay.cpp src/smpi/internals/smpi_process.cpp src/smpi/internals/smpi_utils.cpp @@ -244,7 +242,7 @@ set(SMPI_SRC src/smpi/include/smpi_comm.hpp src/smpi/include/smpi_f2c.hpp src/smpi/include/smpi_group.hpp - src/smpi/include/SmpiHost.hpp + src/smpi/include/smpi_host.hpp src/smpi/include/smpi_datatype.hpp src/smpi/include/smpi_info.hpp src/smpi/include/smpi_keyvals.hpp @@ -255,6 +253,7 @@ set(SMPI_SRC src/smpi/include/smpi_status.hpp src/smpi/include/smpi_win.hpp src/smpi/include/smpi_topo.hpp + src/smpi/plugins/sampi_loadbalancer.cpp src/surf/network_smpi.cpp src/surf/network_ib.cpp ) @@ -280,7 +279,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 @@ -302,48 +300,37 @@ 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 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/host_energy.cpp - src/surf/plugins/link_energy.cpp - src/surf/plugins/host_load.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp src/surf/StorageImpl.cpp @@ -362,18 +349,28 @@ set(SURF_SRC ) set(PLUGINS_SRC + src/plugins/dirty_page_tracking.cpp + src/plugins/host_dvfs.cpp + src/plugins/host_energy.cpp + src/plugins/link_energy.cpp + src/plugins/host_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/VmLiveMigration.cpp + src/plugins/vm/VmLiveMigration.hpp ) - + set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC src/kernel/future.cpp src/simix/libsmx.cpp src/simix/smx_context.cpp + src/kernel/context/context_private.hpp src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp @@ -390,19 +387,23 @@ set(SIMIX_SRC src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/ConditionVariableImpl.cpp + src/kernel/activity/ConditionVariableImpl.hpp src/kernel/activity/CommImpl.cpp src/kernel/activity/CommImpl.hpp src/kernel/activity/ExecImpl.cpp src/kernel/activity/ExecImpl.hpp + src/kernel/activity/IoImpl.cpp + src/kernel/activity/IoImpl.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 - src/kernel/activity/SynchroIo.hpp src/kernel/activity/SynchroRaw.cpp src/kernel/activity/SynchroRaw.hpp - + ${SIMIX_GENERATED_SRC} ) @@ -420,41 +421,34 @@ else() endif() set(S4U_SRC - src/s4u/s4u_actor.cpp - src/s4u/s4u_activity.cpp - src/s4u/s4u_conditionVariable.cpp - src/s4u/s4u_comm.cpp - src/s4u/s4u_engine.cpp - src/s4u/s4u_file.cpp - src/s4u/s4u_host.cpp - src/s4u/s4u_link.cpp - src/s4u/s4u_mailbox.cpp - src/s4u/s4u_mutex.cpp - src/s4u/s4u_netzone.cpp - src/s4u/s4u_storage.cpp + src/s4u/s4u_Actor.cpp + src/s4u/s4u_Activity.cpp + src/s4u/s4u_Barrier.cpp + src/s4u/s4u_ConditionVariable.cpp + src/s4u/s4u_Comm.cpp + src/s4u/s4u_Engine.cpp + src/s4u/s4u_Exec.cpp + src/s4u/s4u_Host.cpp + src/s4u/s4u_Link.cpp + src/s4u/s4u_Mailbox.cpp + src/s4u/s4u_Mutex.cpp + src/s4u/s4u_Netzone.cpp + src/s4u/s4u_Storage.cpp ) set(SIMGRID_SRC src/simgrid/sg_config.cpp - src/simgrid/host.cpp src/simgrid/util.hpp ) set(MSG_SRC - src/msg/instr_msg_process.cpp src/msg/instr_msg_task.cpp - src/msg/msg_actions.cpp - src/msg/msg_deployment.cpp - 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_legacy.cpp src/msg/msg_process.cpp src/msg/msg_synchro.cpp src/msg/msg_task.cpp - src/msg/msg_vm.cpp ) set(SIMDAG_SRC @@ -555,6 +549,7 @@ set(TRACING_SRC 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 src/instr/instr_smpi.hpp src/instr/instr_resource_utilization.cpp @@ -578,6 +573,7 @@ set(MC_SRC_BASE src/mc/mc_replay.hpp src/mc/mc_record.cpp src/mc/mc_config.cpp + src/mc/mc_config.hpp src/mc/mc_global.cpp ) @@ -599,6 +595,17 @@ set(MC_SRC 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 + src/mc/sosp/ChunkedData.hpp + src/mc/sosp/ChunkedData.cpp + src/mc/sosp/RegionSnapshot.cpp + src/mc/sosp/RegionSnapshot.hpp + src/mc/sosp/mc_checkpoint.cpp + src/mc/sosp/mc_snapshot.hpp + src/mc/sosp/mc_snapshot.cpp + src/mc/sosp/mc_page_snapshot.cpp src/mc/AddressSpace.hpp src/mc/Frame.hpp @@ -607,12 +614,6 @@ set(MC_SRC src/mc/ModelChecker.cpp src/mc/ObjectInformation.hpp src/mc/ObjectInformation.cpp - src/mc/PageStore.hpp - src/mc/PageStore.cpp - src/mc/ChunkedData.hpp - src/mc/ChunkedData.cpp - src/mc/RegionSnapshot.cpp - src/mc/RegionSnapshot.hpp src/mc/Type.hpp src/mc/Variable.hpp src/mc/mc_forward.hpp @@ -621,10 +622,6 @@ set(MC_SRC src/mc/mc_unw.hpp src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp - src/mc/mc_checkpoint.cpp - src/mc/mc_snapshot.hpp - src/mc/mc_snapshot.cpp - src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.cpp src/mc/mc_comm_pattern.hpp src/mc/compare.cpp @@ -636,7 +633,7 @@ set(MC_SRC src/mc/mc_dwarf_tagnames.cpp src/mc/mc_hash.hpp src/mc/mc_hash.cpp - src/mc/mc_ignore.h + src/mc/mc_ignore.hpp src/mc/LocationList.hpp src/mc/LocationList.cpp src/mc/mc_record.cpp @@ -662,13 +659,22 @@ set(MC_SRC set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install + + include/simgrid_config.h + include/simgrid/actor.h + include/simgrid/engine.h 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/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/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h @@ -677,31 +683,51 @@ set(headers_to_install include/simgrid/kernel/future.hpp include/simgrid/host.h include/simgrid/link.h - include/simgrid/s4u/forward.hpp + include/simgrid/storage.h + include/simgrid/vm.h + include/simgrid/zone.h include/simgrid/s4u/Activity.hpp include/simgrid/s4u/Actor.hpp + include/simgrid/s4u/Barrier.hpp include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp - include/simgrid/s4u/Engine.hpp - include/simgrid/s4u/File.hpp - include/simgrid/s4u/Host.hpp - include/simgrid/s4u/Link.hpp + include/simgrid/s4u/Engine.hpp + include/simgrid/s4u/Exec.hpp + include/simgrid/s4u/Host.hpp + include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp include/simgrid/s4u/Mutex.hpp include/simgrid/s4u/NetZone.hpp - include/simgrid/s4u/Storage.hpp - include/simgrid/s4u/VirtualMachine.hpp + 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 + include/smpi/smpi_helpers.h + include/smpi/smpi_helpers_internal.h include/smpi/smpi_extended_traces.h 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 @@ -713,7 +739,6 @@ set(headers_to_install include/xbt/cunit.h include/xbt/dict.h include/xbt/dynar.h - include/xbt/dynar.hpp include/xbt/ex.h include/xbt/ex.hpp include/xbt/exception.hpp @@ -727,7 +752,6 @@ set(headers_to_install include/xbt/log.hpp include/xbt/mallocator.h include/xbt/misc.h - include/xbt/mmalloc.h include/xbt/module.h include/xbt/parmap.h include/xbt/range.hpp @@ -736,7 +760,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 @@ -746,7 +769,7 @@ set(headers_to_install include/xbt/xbt_os_time.h ) set(source_of_generated_headers - include/simgrid_config.h.in + include/simgrid/config.h.in include/smpi/mpif.h.in) ### depend of some variables setted upper @@ -776,20 +799,20 @@ endif() ### Simgrid Lib sources set(simgrid_sources - ${PLUGINS_SRC} - ${BINDINGS_SRC} - ${MC_SRC_BASE} - ${MSG_SRC} ${S4U_SRC} - ${SIMDAG_SRC} ${SIMGRID_SRC} + ${MC_SRC_BASE} ${SIMIX_SRC} ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC} + ${PLUGINS_SRC} + ${BINDINGS_SRC} + ${MSG_SRC} + ${SIMDAG_SRC} ) -if(${SIMGRID_HAVE_JEDULE}) +if(${SIMGRID_HAVE_JEDULE}) set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC}) else() set(EXTRA_DIST ${EXTRA_DIST} ${JEDULE_SRC}) @@ -826,6 +849,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 +883,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 @@ -873,10 +898,10 @@ set(DOC_SOURCES doc/doxygen/module-index.doc doc/doxygen/ns3.doc doc/doxygen/options.doc - doc/doxygen/outcomes.doc - doc/doxygen/outcomes_logs.doc - doc/doxygen/outcomes_MC.doc - doc/doxygen/outcomes_vizu.doc + doc/doxygen/outcomes.doc + doc/doxygen/outcomes_logs.doc + doc/doxygen/outcomes_MC.doc + doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc doc/doxygen/platform_lua.doc doc/doxygen/scenario.doc @@ -892,17 +917,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 ) @@ -922,6 +947,7 @@ set(DOC_TOOLS set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png + ${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 @@ -962,7 +988,7 @@ set(txt_files TODO ) -# The list of cmake build directories is constructed from the following list. +# 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/java/CMakeLists.txt @@ -986,7 +1012,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt - + teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -1018,7 +1044,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/topo/CMakeLists.txt teshsuite/smpi/mpich3-test/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/perf/CMakeLists.txt - + tools/CMakeLists.txt tools/graphicator/CMakeLists.txt tools/tesh/CMakeLists.txt