X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fc07005abb54bbceec067c73455b50f96e5d908..64916baf9d485ba6a2546bf79c948c591a233465:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index c4ee641d7c..81feb43200 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -10,6 +10,7 @@ set(EXTRA_DIST src/mc/mc_record.h src/include/simgrid/sg_config.h src/include/smpi/smpi_interface.h + src/include/smpi/smpi_utils.hpp src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/surf.h @@ -17,7 +18,7 @@ set(EXTRA_DIST src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h - src/simdag/simdag_private.h + src/simdag/simdag_private.hpp src/simix/simcalls.in src/simix/simcalls.py src/simix/popping_private.h @@ -29,15 +30,13 @@ set(EXTRA_DIST src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h - src/simix/smx_process_private.h src/simix/smx_synchro_private.h - src/simix/Synchro.h - src/simix/SynchroComm.hpp - src/simix/SynchroExec.hpp - src/simix/SynchroIo.hpp - src/simix/SynchroSleep.hpp - src/simix/SynchroRaw.hpp - src/smpi/README + src/kernel/activity/ActivityImpl.hpp + src/kernel/activity/SynchroComm.hpp + src/kernel/activity/SynchroExec.hpp + src/kernel/activity/SynchroIo.hpp + src/kernel/activity/SynchroSleep.hpp + src/kernel/activity/SynchroRaw.hpp src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h src/smpi/colls/colls_private.h @@ -57,32 +56,16 @@ set(EXTRA_DIST src/surf/network_ib.hpp src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h - src/surf/plugins/energy.hpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/surf/AsImpl.hpp - src/surf/AsCluster.hpp - src/surf/AsClusterFatTree.hpp - src/surf/AsClusterTorus.hpp - src/surf/AsClusterDragonfly.hpp - src/surf/AsDijkstra.hpp - src/surf/AsFloyd.hpp - src/surf/AsFull.hpp - src/surf/AsRoutedGraph.hpp - src/surf/AsNone.hpp - src/surf/AsVivaldi.hpp - src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.h - src/surf/surf_routing.hpp - src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp - src/surf/virtual_machine.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -95,7 +78,6 @@ set(EXTRA_DIST src/xbt/backtrace_linux.cpp src/xbt/dict_private.h src/xbt/ex_interface.h - src/xbt/fifo_private.h src/xbt/graph_private.h src/xbt/heap_private.h src/xbt/log_private.h @@ -116,6 +98,9 @@ set(EXTRA_DIST teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh + + examples/java/.classpath + examples/java/.project ) set(SMPI_SRC @@ -238,7 +223,11 @@ set(SMPI_SRC src/smpi/smpi_replay.cpp src/smpi/smpi_rma.cpp src/smpi/smpi_topo.cpp + src/smpi/smpi_utils.cpp src/smpi/smpi_f77.cpp + + src/surf/network_smpi.cpp + src/surf/network_ib.cpp ) set(XBT_SRC @@ -254,7 +243,6 @@ set(XBT_SRC src/xbt/dynar.cpp src/xbt/ex.cpp src/xbt/exception.cpp - src/xbt/fifo.c src/xbt/graph.c src/xbt/heap.c src/xbt/lib.c @@ -269,7 +257,7 @@ set(XBT_SRC src/xbt/xbt_log_appender_file.c src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c - src/xbt/xbt_main.c + src/xbt/xbt_main.cpp src/xbt/xbt_matrix.c src/xbt/xbt_os_file.c src/xbt/xbt_os_synchro.c @@ -289,18 +277,34 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC - src/surf/AsImpl.cpp - src/surf/AsCluster.cpp - src/surf/AsClusterFatTree.cpp - src/surf/AsClusterTorus.cpp - src/surf/AsClusterDragonfly.cpp - src/surf/AsDijkstra.cpp - src/surf/AsFloyd.cpp - src/surf/AsFull.cpp - src/surf/AsRoutedGraph.cpp - src/surf/AsNone.cpp - src/surf/AsVivaldi.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/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 @@ -312,9 +316,7 @@ set(SURF_SRC src/surf/network_cm02.cpp src/surf/network_constant.cpp src/surf/network_interface.cpp - src/surf/network_smpi.cpp - src/surf/network_ib.cpp - src/surf/plugins/energy.cpp + src/surf/plugins/host_energy.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp src/surf/storage_interface.cpp @@ -328,35 +330,45 @@ set(SURF_SRC src/surf/xml/surfxml_parseplatf.cpp src/surf/trace_mgr.hpp src/surf/trace_mgr.cpp - src/surf/vm_hl13.cpp - src/surf/virtual_machine.cpp src/surf/host_clm03.cpp src/surf/HostImpl.cpp src/surf/ptask_L07.cpp ) +set(PLUGINS_SRC + 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 + ) + 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/simix/Context.cpp - src/simix/ContextRaw.cpp + src/kernel/context/Context.cpp + src/kernel/context/Context.hpp + src/kernel/context/ContextRaw.cpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp src/simix/smx_host.cpp src/simix/smx_io.cpp src/simix/smx_network.cpp - src/simix/smx_process.cpp + src/simix/ActorImpl.cpp + src/simix/ActorImpl.hpp src/simix/smx_synchro.cpp - src/simix/smx_vm.cpp src/simix/popping.cpp - src/simix/Synchro.cpp - src/simix/SynchroComm.cpp - src/simix/SynchroExec.cpp - src/simix/SynchroSleep.cpp - src/simix/SynchroRaw.cpp - src/simix/SynchroIo.cpp + src/kernel/activity/ActivityImpl.cpp + src/kernel/activity/MailboxImpl.cpp + src/kernel/activity/MailboxImpl.hpp + src/kernel/activity/SynchroComm.cpp + src/kernel/activity/SynchroExec.cpp + src/kernel/activity/SynchroSleep.cpp + src/kernel/activity/SynchroRaw.cpp + src/kernel/activity/SynchroIo.cpp ${SIMIX_GENERATED_SRC} ) @@ -365,25 +377,27 @@ set(SIMIX_SRC if (HAVE_BOOST_CONTEXTS) set(SIMIX_SRC ${SIMIX_SRC} - src/simix/ContextBoost.hpp - src/simix/ContextBoost.cpp) + src/kernel/context/ContextBoost.hpp + src/kernel/context/ContextBoost.cpp) else() set(EXTRA_DIST ${EXTRA_DIST} - src/simix/ContextBoost.hpp - src/simix/ContextBoost.cpp) + src/kernel/context/ContextBoost.hpp + src/kernel/context/ContextBoost.cpp) endif() set(S4U_SRC src/s4u/s4u_actor.cpp - src/s4u/s4u_as.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 ) @@ -396,7 +410,6 @@ set(SIMGRID_SRC set(MSG_SRC src/msg/instr_msg_process.cpp src/msg/instr_msg_task.cpp - src/msg/instr_msg_vm.cpp src/msg/msg_actions.cpp src/msg/msg_deployment.cpp src/msg/msg_environment.cpp @@ -413,15 +426,10 @@ set(MSG_SRC set(SIMDAG_SRC src/simdag/sd_daxloader.cpp + src/simdag/sd_dotloader.cpp src/simdag/sd_global.cpp src/simdag/sd_task.cpp - src/simdag/sd_workstation.cpp ) -if(HAVE_GRAPHVIZ) - set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp) -else() - set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.cpp) -endif() set(BINDINGS_SRC src/bindings/lua/lua_private.h @@ -470,7 +478,6 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/Msg.java src/bindings/java/org/simgrid/msg/MsgException.java src/bindings/java/org/simgrid/msg/Mutex.java - src/bindings/java/org/simgrid/msg/NativeException.java src/bindings/java/org/simgrid/msg/Process.java src/bindings/java/org/simgrid/msg/ProcessKilledError.java src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java @@ -518,12 +525,12 @@ set(TRACING_SRC ) set(JEDULE_SRC - include/simgrid/jedule/jedule_events.h - include/simgrid/jedule/jedule_output.h - include/simgrid/jedule/jedule_platform.h + 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_output.cpp + src/instr/jedule/jedule.cpp src/instr/jedule/jedule_platform.cpp src/instr/jedule/jedule_sd_binding.cpp ) @@ -539,17 +546,24 @@ set(MC_SRC_BASE ) set(MC_SRC - src/mc/RemotePtr.hpp + 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/LivenessChecker.cpp + src/mc/checker/LivenessChecker.hpp + src/mc/remote/Channel.cpp + src/mc/remote/Channel.hpp + src/mc/remote/Client.cpp + src/mc/remote/Client.hpp + src/mc/remote/RemotePtr.hpp + src/mc/remote/mc_protocol.h + src/mc/remote/mc_protocol.cpp + src/mc/AddressSpace.hpp src/mc/AddressSpace.cpp - src/mc/Channel.cpp - src/mc/Channel.hpp - src/mc/Checker.cpp - src/mc/Checker.hpp - src/mc/Client.cpp - src/mc/Client.hpp - src/mc/CommunicationDeterminismChecker.cpp - src/mc/CommunicationDeterminismChecker.hpp src/mc/Frame.hpp src/mc/Frame.cpp src/mc/ModelChecker.hpp @@ -558,8 +572,6 @@ set(MC_SRC src/mc/ObjectInformation.cpp src/mc/PageStore.hpp src/mc/PageStore.cpp - src/mc/SafetyChecker.cpp - src/mc/SafetyChecker.hpp src/mc/ChunkedData.hpp src/mc/ChunkedData.cpp src/mc/RegionSnapshot.cpp @@ -592,10 +604,8 @@ set(MC_SRC src/mc/mc_hash.cpp src/mc/mc_ignore.h src/mc/mc_mmalloc.h - src/mc/LivenessChecker.hpp src/mc/LocationList.hpp src/mc/LocationList.cpp - src/mc/LivenessChecker.cpp src/mc/mc_record.cpp src/mc/mc_member.cpp src/mc/mc_memory.cpp @@ -608,8 +618,6 @@ set(MC_SRC src/mc/VisitedState.cpp src/mc/VisitedState.hpp src/mc/mc_client_api.cpp - src/mc/mc_protocol.h - src/mc/mc_protocol.cpp src/mc/mc_smx.h src/mc/mc_smx.cpp src/mc/mc_xbt.hpp @@ -618,19 +626,18 @@ set(MC_SRC src/mc/Transition.hpp ) -set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp) +set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install include/msg/msg.h include/msg/datatypes.h include/simdag/simdag.h include/simdag/datatypes.h - + include/simgrid/chrono.hpp include/simgrid/plugins/energy.h include/simgrid/instr.h include/simgrid/msg.h include/simgrid/simdag.h - include/simgrid.h include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/forward.h @@ -641,17 +648,20 @@ set(headers_to_install include/simgrid/host.h include/simgrid/link.h include/simgrid/s4u/forward.hpp - include/simgrid/s4u/actor.hpp - include/simgrid/s4u/As.hpp include/simgrid/s4u/Activity.hpp + include/simgrid/s4u/Actor.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/mailbox.hpp - include/simgrid/s4u/mutex.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.h + include/simgrid/s4u/VirtualMachine.hpp + include/simgrid/s4u.hpp include/simgrid/plugins/energy.h include/smpi/mpi.h include/smpi/smpi.h @@ -674,10 +684,10 @@ set(headers_to_install include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h + include/xbt/ex.hpp include/xbt/exception.hpp include/xbt/backtrace.h include/xbt/backtrace.hpp - include/xbt/fifo.h include/xbt/file.h include/xbt/function_types.h include/xbt/functional.hpp @@ -700,7 +710,7 @@ set(headers_to_install include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h - include/xbt/synchro_core.h + include/xbt/synchro.h include/xbt/sysdep.h include/xbt/system_error.hpp include/xbt/utility.hpp @@ -715,11 +725,11 @@ set(source_of_generated_headers ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC ${SURF_SRC} src/simix/ContextThread.cpp - src/simix/ContextThread.hpp ) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp ) else() # NOT pthread - set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp - src/simix/ContextThread.hpp ) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp ) endif() if(${HAVE_THREAD_CONTEXTS}) #pthread @@ -730,13 +740,14 @@ else() # NOT pthread endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/simix/ContextUnix.cpp) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextUnix.cpp) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp) endif() ### Simgrid Lib sources set(simgrid_sources + ${PLUGINS_SRC} ${BINDINGS_SRC} ${MC_SRC_BASE} ${MSG_SRC} @@ -771,8 +782,8 @@ endif() if(WIN32) set(simgrid_sources ${simgrid_sources} - src/simix/ContextThread.cpp - src/simix/ContextThread.hpp + src/kernel/context/ContextThread.cpp + src/kernel/context/ContextThread.hpp src/xbt/xbt_os_thread.c ) endif() @@ -803,14 +814,12 @@ set(DOC_SOURCES doc/doxygen/FAQ.doc doc/doxygen/application.doc doc/doxygen/community.doc - doc/doxygen/community_contact.doc - doc/doxygen/community_extend.doc - doc/doxygen/community_giveback.doc doc/doxygen/deployment.doc doc/doxygen/examples.doc doc/doxygen/footer.html doc/doxygen/getting_started.doc doc/doxygen/header.html + doc/doxygen/howtos.doc doc/doxygen/index.doc doc/doxygen/inside.doc doc/doxygen/inside_tests.doc @@ -821,7 +830,8 @@ set(DOC_SOURCES doc/doxygen/install.doc doc/doxygen/install_yours.doc doc/doxygen/java.doc - doc/doxygen/tutorial.doc + doc/doxygen/tutorial_msg.doc + doc/doxygen/tutorial_smpi.doc doc/doxygen/models.doc doc/doxygen/module-msg.doc doc/doxygen/module-s4u.doc @@ -843,18 +853,22 @@ set(DOC_SOURCES doc/doxygen/scenario.doc doc/doxygen/stylesheet.css doc/doxygen/uhood.doc + doc/doxygen/uhood_switch.doc + doc/doxygen/uhood_arch.doc doc/manpage/smpicc.1 doc/manpage/smpicxx.1 doc/manpage/smpif90.1 doc/manpage/smpiff.1 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 @@ -912,8 +926,6 @@ set(txt_files AUTHORS COPYING README - README.java - README.lua ChangeLog INSTALL LICENSE-LGPL-2.1 @@ -984,6 +996,7 @@ set(CMAKEFILES_TXT set(CMAKE_SOURCE_FILES CMakeLists.txt + FindSimGrid.cmake tools/cmake/Tests.cmake tools/cmake/CTestConfig.cmake tools/cmake/CTestCustom.cmake @@ -995,25 +1008,16 @@ set(CMAKE_SOURCE_FILES tools/cmake/Java.cmake tools/cmake/MakeLib.cmake tools/cmake/MakeLibWin.cmake - tools/cmake/Modules/FindGFortran.cmake tools/cmake/Modules/FindGraphviz.cmake tools/cmake/Modules/FindLibdw.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/FindRngStream.cmake - tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake - tools/cmake/scripts/IPC/Run.pm - tools/cmake/scripts/IPC/Run/Debug.pm - tools/cmake/scripts/IPC/Run/IO.pm - tools/cmake/scripts/IPC/Run/Timer.pm - tools/cmake/scripts/IPC/Run/Win32Helper.pm - tools/cmake/scripts/IPC/Run/Win32IO.pm - tools/cmake/scripts/IPC/Run/Win32Pump.pm - tools/cmake/scripts/Diff.pm tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake @@ -1048,6 +1052,9 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml + examples/platforms/cluster_torus.xml + examples/platforms/cluster_fat_tree.xml + examples/platforms/cluster_dragonfly.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf @@ -1071,13 +1078,11 @@ set(PLATFORMS_EXAMPLES examples/platforms/dogbone.xml examples/platforms/energy_platform.xml examples/platforms/faulty_host.xml - examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/onelink.xml - examples/platforms/platform.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua @@ -1099,7 +1104,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_meridian.syscoord examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/three_multicore_hosts.xml - examples/platforms/torus_cluster.xml examples/platforms/two_clusters.xml examples/platforms/two_hosts.xml examples/platforms/two_hosts_platform_shared.xml