X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92b92a411497b1bc2b7619ab59cd516ecd8c8081..1a47983d10fc885fce991aaed002c337167215d8:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 3cb6710abe..4f385d9b7d 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -6,26 +6,29 @@ 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 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 src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp @@ -34,11 +37,9 @@ 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/network_ns3.hpp src/surf/network_smpi.hpp src/surf/network_ib.hpp @@ -48,11 +49,8 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/surf/StorageImpl.hpp - src/surf/storage_n11.hpp + src/surf/disk_s19.hpp src/surf/surf_interface.hpp - src/surf/surf_private.hpp - src/surf/PropertyHolder.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -66,7 +64,6 @@ set(EXTRA_DIST src/xbt/mallocator_private.h src/xbt/mmalloc/mfree.c - src/xbt/mmalloc/mm.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c src/xbt/mmalloc/mmalloc.c @@ -77,21 +74,65 @@ 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 + src/smpi/internals/instr_smpi.cpp + src/smpi/internals/smpi_bench.cpp + src/smpi/internals/smpi_memory.cpp + src/smpi/internals/smpi_shared.cpp + src/smpi/internals/smpi_deployment.cpp + src/smpi/internals/smpi_global.cpp + src/smpi/internals/smpi_host.cpp + src/smpi/internals/smpi_replay.cpp + src/smpi/internals/smpi_actor.cpp + src/smpi/internals/smpi_utils.cpp + src/smpi/internals/smpi_config.cpp + src/smpi/mpi/smpi_comm.cpp + src/smpi/mpi/smpi_datatype.cpp + src/smpi/mpi/smpi_datatype_derived.cpp + src/smpi/mpi/smpi_errhandler.cpp + src/smpi/mpi/smpi_f2c.cpp + src/smpi/mpi/smpi_file.cpp + src/smpi/mpi/smpi_group.cpp + src/smpi/mpi/smpi_info.cpp + src/smpi/mpi/smpi_keyvals.cpp + src/smpi/mpi/smpi_op.cpp + src/smpi/mpi/smpi_request.cpp + src/smpi/mpi/smpi_status.cpp + src/smpi/mpi/smpi_topo.cpp + src/smpi/mpi/smpi_win.cpp + src/smpi/include/smpi_actor.hpp + src/smpi/include/smpi_coll.hpp + src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_config.hpp + src/smpi/include/smpi_datatype_derived.hpp + src/smpi/include/smpi_datatype.hpp + src/smpi/include/smpi_errhandler.hpp + src/smpi/include/smpi_f2c.hpp + src/smpi/include/smpi_file.hpp + src/smpi/include/smpi_group.hpp + src/smpi/include/smpi_host.hpp + 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 + src/smpi/include/smpi_win.hpp + 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/surf/network_smpi.cpp + src/surf/network_ib.cpp src/smpi/bindings/smpi_mpi.cpp src/smpi/bindings/smpi_pmpi.cpp src/smpi/bindings/smpi_pmpi_coll.cpp src/smpi/bindings/smpi_pmpi_comm.cpp + src/smpi/bindings/smpi_pmpi_file.cpp src/smpi/bindings/smpi_pmpi_group.cpp src/smpi/bindings/smpi_pmpi_info.cpp src/smpi/bindings/smpi_pmpi_op.cpp @@ -102,8 +143,17 @@ 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 + src/smpi/colls/smpi_nbc_impl.cpp + src/smpi/colls/smpi_automatic_selector.cpp + src/smpi/colls/smpi_default_selector.cpp + src/smpi/colls/smpi_mpich_selector.cpp + src/smpi/colls/smpi_intel_mpi_selector.cpp + src/smpi/colls/smpi_openmpi_selector.cpp + src/smpi/colls/smpi_mvapich2_selector.cpp src/smpi/colls/allgather/allgather-2dmesh.cpp src/smpi/colls/allgather/allgather-3dmesh.cpp src/smpi/colls/allgather/allgather-GB.cpp @@ -203,65 +253,9 @@ set(SMPI_SRC src/smpi/colls/reduce/reduce-rab.cpp src/smpi/colls/scatter/scatter-ompi.cpp src/smpi/colls/scatter/scatter-mvapich-two-level.cpp - src/smpi/colls/smpi_automatic_selector.cpp - src/smpi/colls/smpi_default_selector.cpp - src/smpi/colls/smpi_mpich_selector.cpp - src/smpi/colls/smpi_intel_mpi_selector.cpp - src/smpi/colls/smpi_openmpi_selector.cpp - src/smpi/colls/smpi_mvapich2_selector.cpp - src/smpi/colls/smpi_coll.cpp - src/smpi/internals/instr_smpi.cpp - src/smpi/internals/smpi_bench.cpp - src/smpi/internals/smpi_memory.cpp - src/smpi/internals/smpi_shared.cpp - src/smpi/internals/smpi_static_variables.cpp - src/smpi/internals/smpi_deployment.cpp - src/smpi/internals/smpi_dvfs.cpp - src/smpi/internals/smpi_global.cpp - src/smpi/internals/smpi_host.cpp - src/smpi/internals/smpi_replay.cpp - src/smpi/internals/smpi_actor.cpp - src/smpi/internals/smpi_utils.cpp - src/smpi/mpi/smpi_comm.cpp - src/smpi/mpi/smpi_datatype.cpp - src/smpi/mpi/smpi_datatype_derived.cpp - src/smpi/mpi/smpi_f2c.cpp - src/smpi/mpi/smpi_group.cpp - src/smpi/mpi/smpi_info.cpp - src/smpi/mpi/smpi_keyvals.cpp - src/smpi/mpi/smpi_op.cpp - src/smpi/mpi/smpi_request.cpp - src/smpi/mpi/smpi_status.cpp - src/smpi/mpi/smpi_topo.cpp - src/smpi/mpi/smpi_win.cpp - src/smpi/include/smpi_actor.hpp - src/smpi/include/smpi_coll.hpp - src/smpi/include/smpi_comm.hpp - src/smpi/include/smpi_datatype_derived.hpp - src/smpi/include/smpi_datatype.hpp - src/smpi/include/smpi_f2c.hpp - src/smpi/include/smpi_group.hpp - src/smpi/include/smpi_host.hpp - src/smpi/include/smpi_info.hpp - src/smpi/include/smpi_keyvals.hpp - src/smpi/include/smpi_op.hpp - src/smpi/include/smpi_request.hpp - 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 ) set(XBT_SRC - src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c src/xbt/backtrace.cpp @@ -277,7 +271,9 @@ set(XBT_SRC src/xbt/memory_map.cpp src/xbt/memory_map.hpp src/xbt/OsSemaphore.hpp + src/xbt/PropertyHolder.cpp src/xbt/parmap.cpp + src/xbt/random.cpp src/xbt/snprintf.c src/xbt/string.cpp src/xbt/xbt_log_appender_file.cpp @@ -285,16 +281,17 @@ 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.c - src/xbt_modinter.h + src/xbt/xbt_virtu.cpp ) if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c ) +else() + set(EXTRA_DIST ${EXTRA_DIST} src/xbt/mmalloc/mm.c) endif() set(NS3_SRC src/surf/network_ns3.cpp @@ -302,15 +299,33 @@ set(NS3_SRC src/surf/network_ns3.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/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.cpp - src/kernel/resource/profile/trace_mgr.hpp - src/kernel/resource/profile/trace_mgr.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 + src/kernel/resource/profile/Event.hpp + src/kernel/resource/profile/FutureEvtSet.cpp + src/kernel/resource/profile/FutureEvtSet.hpp + src/kernel/resource/profile/ProfileBuilder.cpp + 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 @@ -321,24 +336,23 @@ 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 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/PropertyHolder.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 src/surf/xml/platf_private.hpp @@ -350,18 +364,15 @@ set(SURF_SRC ) set(PLUGINS_SRC - src/plugins/dirty_page_tracking.cpp + src/plugins/ProducerConsumer.cpp 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 - 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 ) @@ -371,7 +382,6 @@ 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 @@ -380,11 +390,6 @@ set(SIMIX_SRC src/kernel/context/ContextSwapped.hpp src/kernel/context/ContextThread.cpp src/kernel/context/ContextThread.hpp - src/simix/smx_deployment.cpp - src/simix/smx_environment.cpp - src/simix/smx_global.cpp - src/simix/ActorImpl.cpp - src/simix/ActorImpl.hpp src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp src/kernel/activity/ActivityImpl.hpp @@ -406,6 +411,10 @@ set(SIMIX_SRC src/kernel/activity/SleepImpl.hpp src/kernel/activity/SynchroRaw.cpp 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} ) @@ -429,6 +438,7 @@ set(S4U_SRC src/s4u/s4u_Barrier.cpp src/s4u/s4u_ConditionVariable.cpp src/s4u/s4u_Comm.cpp + src/s4u/s4u_Disk.cpp src/s4u/s4u_Engine.cpp src/s4u/s4u_Exec.cpp src/s4u/s4u_Host.cpp @@ -438,34 +448,26 @@ set(S4U_SRC src/s4u/s4u_Mutex.cpp src/s4u/s4u_Netzone.cpp src/s4u/s4u_Semaphore.cpp - src/s4u/s4u_Storage.cpp + src/s4u/s4u_VirtualMachine.cpp ) set(SIMGRID_SRC src/simgrid/Exception.cpp src/simgrid/sg_config.cpp + src/simgrid/sg_version.cpp src/simgrid/util.hpp ) set(MSG_SRC src/msg/msg_global.cpp - src/msg/msg_gos.cpp + src/msg/msg_comm.cpp src/msg/msg_legacy.cpp src/msg/msg_process.cpp 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(BINDINGS_SRC - src/bindings/lua/lua_private.hpp - src/bindings/lua/lua_utils.hpp - src/bindings/lua/simgrid_lua.hpp +set(DAG_SRC + src/dag/loaders.cpp ) set(JMSG_C_SRC @@ -475,14 +477,10 @@ 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 src/bindings/java/jmsg_process.h - src/bindings/java/jmsg_rngstream.cpp - src/bindings/java/jmsg_rngstream.h src/bindings/java/jmsg_synchro.cpp src/bindings/java/jmsg_synchro.h src/bindings/java/jmsg_task.cpp @@ -493,15 +491,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 @@ -512,10 +507,7 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/Process.java src/bindings/java/org/simgrid/msg/ProcessKilledError.java src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java - src/bindings/java/org/simgrid/msg/RngStream.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 @@ -533,13 +525,6 @@ set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java) list(APPEND JMSG_C_SRC ${JTRACE_C_SRC}) list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) -set(LUA_SRC - src/bindings/lua/lua_host.cpp - src/bindings/lua/lua_platf.cpp - src/bindings/lua/lua_debug.cpp - src/bindings/lua/simgrid_lua.cpp - ) - set(TRACING_SRC src/instr/instr_config.cpp src/instr/instr_interface.cpp @@ -551,7 +536,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 @@ -559,20 +543,9 @@ 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.h + src/mc/mc_base.hpp src/mc/mc_record.hpp src/mc/mc_replay.hpp src/mc/mc_record.cpp @@ -582,7 +555,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 @@ -590,81 +562,85 @@ set(MC_SRC src/mc/checker/SafetyChecker.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 + src/mc/inspect/Frame.cpp + src/mc/inspect/LocationList.hpp + src/mc/inspect/LocationList.cpp + src/mc/inspect/ObjectInformation.hpp + src/mc/inspect/ObjectInformation.cpp + src/mc/inspect/Type.hpp + src/mc/inspect/Variable.hpp + src/mc/inspect/mc_dwarf.hpp + src/mc/inspect/mc_dwarf.cpp + src/mc/inspect/mc_dwarf_attrnames.cpp + src/mc/inspect/mc_dwarf_tagnames.cpp + src/mc/inspect/mc_member.cpp + src/mc/inspect/mc_unw.hpp + 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/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 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/sosp/Region.cpp + src/mc/sosp/Region.hpp + src/mc/sosp/Snapshot.hpp + src/mc/sosp/Snapshot.cpp + src/mc/AddressSpace.hpp - src/mc/Frame.hpp - src/mc/Frame.cpp src/mc/ModelChecker.hpp src/mc/ModelChecker.cpp - src/mc/ObjectInformation.hpp - src/mc/ObjectInformation.cpp - src/mc/Type.hpp - src/mc/Variable.hpp src/mc/mc_forward.hpp src/mc/Session.cpp src/mc/Session.hpp - src/mc/mc_unw.hpp - src/mc/mc_unw.cpp - src/mc/mc_unw_vmread.cpp - src/mc/mc_comm_pattern.cpp src/mc/mc_comm_pattern.hpp + src/mc/mc_pattern.hpp src/mc/compare.cpp - src/mc/mc_dwarf.hpp - src/mc/mc_dwarf.cpp - src/mc/mc_dwarf_attrnames.cpp - src/mc/DwarfExpression.hpp - src/mc/DwarfExpression.cpp - src/mc/mc_dwarf_tagnames.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/LocationList.hpp - src/mc/LocationList.cpp src/mc/mc_record.cpp - src/mc/mc_member.cpp - src/mc/mc_memory.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) set(headers_to_install - include/simgrid_config.h 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 @@ -672,22 +648,22 @@ 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/instr.h include/simgrid/mailbox.h - include/simgrid/msg.h - include/simgrid/simdag.h include/simgrid/modelchecker.h include/simgrid/forward.h include/simgrid/simix.h include/simgrid/simix.hpp - include/simgrid/simix/blocking_simcall.hpp + include/simgrid/kernel/ProfileBuilder.hpp + include/simgrid/kernel/Timer.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 @@ -695,6 +671,7 @@ set(headers_to_install include/simgrid/s4u/Barrier.hpp include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp + include/simgrid/s4u/Disk.hpp include/simgrid/s4u/Engine.hpp include/simgrid/s4u/Exec.hpp include/simgrid/s4u/Host.hpp @@ -704,13 +681,12 @@ 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 include/simgrid/kernel/routing/ClusterZone.hpp include/simgrid/kernel/routing/DijkstraZone.hpp @@ -722,8 +698,10 @@ 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 include/smpi/mpi.h include/smpi/sampi.h @@ -749,21 +727,22 @@ 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 include/xbt/mallocator.h include/xbt/misc.h include/xbt/module.h + 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/RngStream.h 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 @@ -772,11 +751,11 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid/config.h.in + include/simgrid/version.h.in src/internal_config.h.in - src/simgrid/version.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) @@ -795,15 +774,15 @@ set(simgrid_sources ${TRACING_SRC} ${XBT_SRC} ${PLUGINS_SRC} - ${BINDINGS_SRC} - ${MSG_SRC} - ${SIMDAG_SRC} + ${DAG_SRC} ) -if(${SIMGRID_HAVE_JEDULE}) - set(simgrid_sources ${simgrid_sources} ${JEDULE_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} ${JEDULE_SRC}) + set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/msg.h + ${MSG_SRC}) endif() if(enable_smpi) @@ -815,40 +794,28 @@ if(SIMGRID_HAVE_MC) endif() if(SIMGRID_HAVE_NS3) - set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) -endif() + set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp) -if(SIMGRID_HAVE_LUA) - set(simgrid_sources ${simgrid_sources} ${LUA_SRC}) -else() - set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC}) + set(simgrid_sources ${simgrid_sources} ${NS3_SRC}) +else() + set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp) endif() set(DOC_SOURCES - doc/Doxyfile.in - doc/Layout.xml - doc/doxygen/FAQ.doc - doc/doxygen/deployment.doc doc/doxygen/inside.doc doc/doxygen/inside_tests.doc 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-xbt.doc doc/doxygen/module-index.doc - doc/doxygen/ns3.doc - doc/doxygen/outcomes.doc - doc/doxygen/outcomes_logs.doc doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc - doc/doxygen/platform_lua.doc doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc - doc/doxygen/uhood_arch.doc + + examples/README.rst docs/manpages/smpicc.1 docs/manpages/smpicxx.1 @@ -858,40 +825,74 @@ 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/source/_ext/hidden_code_block.py + docs/find-missing.ignore + docs/find-missing.py + 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 docs/source/img/extlink.png docs/source/img/extlink.svg docs/source/img/graphical-toc.svg - docs/source/img/lang_cpp.png - docs/source/img/lang_python.png docs/source/img/smpi_simgrid_alltoall_pair_16.png 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 + docs/source/img/zoom_comm.drawio + docs/source/img/zoom_comm.svg - docs/ignored_symbols docs/source/application.rst - docs/source/app_java.rst docs/source/app_msg.rst 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 + docs/source/Experimental_setup.rst docs/source/index.rst - docs/source/intro_concepts.rst - docs/source/introduction.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/platform.rst - docs/source/platform_examples.rst - docs/source/platform_howtos.rst - docs/source/platform_reference.rst - docs/source/Configuring_SimGrid.rst - docs/source/scenario.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_routing.rst + docs/source/Plugins.rst + docs/source/Release_Notes.rst + docs/source/XML_reference.rst + docs/source/Design_goals.rst docs/source/Tutorial_Algorithms.rst docs/source/tuto_s4u/deployment1.xml @@ -917,17 +918,54 @@ set(DOC_SOURCES docs/source/tuto_smpi/gemm_mpi.cpp docs/source/tuto_smpi/roundtrip.c - CITATION.bib - ) + docs/source/tuto_disk/analysis.org + docs/source/tuto_disk/analysis.irst + docs/source/tuto_disk/CMakeLists.txt + docs/source/tuto_disk/Dockerfile + docs/source/tuto_disk/fig/edel_read_dhist.png + docs/source/tuto_disk/fig/edel_write_dhist.png + docs/source/tuto_disk/fig/griffon_deg.png + docs/source/tuto_disk/fig/griffon_read_dhist.png + docs/source/tuto_disk/fig/griffon_write_dhist.png + 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 -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 ) @@ -936,16 +974,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 @@ -971,26 +1000,26 @@ 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/platforms/CMakeLists.txt + examples/c/CMakeLists.txt + examples/cpp/CMakeLists.txt examples/smpi/CMakeLists.txt - examples/smpi/NAS/CMakeLists.txt - examples/smpi/smpi_msg_masterslave/CMakeLists.txt - examples/smpi/replay_multiple/CMakeLists.txt - examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt - examples/smpi/energy/f77/CMakeLists.txt - examples/smpi/energy/f90/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/CMakeLists.txt - examples/deprecated/msg/mc/CMakeLists.txt - examples/deprecated/simdag/CMakeLists.txt teshsuite/java/CMakeLists.txt + teshsuite/kernel/CMakeLists.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/simix/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt @@ -1001,6 +1030,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/comm/CMakeLists.txt teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/errhan/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt @@ -1021,6 +1051,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/group/CMakeLists.txt teshsuite/smpi/mpich3-test/info/CMakeLists.txt + teshsuite/smpi/mpich3-test/io/CMakeLists.txt teshsuite/smpi/mpich3-test/init/CMakeLists.txt teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -1051,9 +1082,9 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLibelf.cmake tools/cmake/Modules/FindLibunwind.cmake tools/cmake/Modules/FindLibevent.cmake - tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake + tools/cmake/Modules/pybind11Config.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake tools/cmake/scripts/fixup_simgrid_dtd_l.pl @@ -1063,6 +1094,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_stackgrowth.c tools/cmake/test_prog/prog_stacksetup.c + tools/cmake/test_prog/prog_tsan.cpp tools/cmake/cross-mingw.cmake tools/smpi/generate_smpi_defines.pl tools/stack-cleaner/as @@ -1072,17 +1104,22 @@ set(CMAKE_SOURCE_FILES tools/stack-cleaner/clean-stack-filter tools/stack-cleaner/compiler-wrapper tools/stack-cleaner/README + + setup.py + MANIFEST.in + MANIFEST.in.in ) set(PLATFORMS_EXAMPLES - examples/platforms/bypassASroute.xml + examples/platforms/bypassZoneRoute.xml 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 @@ -1095,7 +1132,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/optorsim/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml - examples/platforms/profiles/bourassa_state.profile + examples/platforms/model_checker_platform.xml examples/platforms/profiles/fafard_state.profile examples/platforms/profiles/faulty_host.profile examples/platforms/profiles/ginette_state.profile @@ -1114,22 +1151,22 @@ set(PLATFORMS_EXAMPLES examples/platforms/energy_cluster.xml examples/platforms/faulty_host.xml examples/platforms/g5k.xml + examples/platforms/griffon.cpp examples/platforms/griffon.xml + examples/platforms/hosts_with_disks.xml examples/platforms/meta_cluster.xml 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/content/win_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 examples/platforms/small_platform_failures.xml examples/platforms/small_platform_fatpipe.xml @@ -1147,6 +1184,9 @@ 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 ) set(generated_src_files