X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d33aed39822fd01eb92af242ea062507d440479c..c642311b1135f0d4a8f55e5822d9c0b4fb8e5e5d:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b11a9df611..586f2aec7b 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -29,15 +29,21 @@ set(EXTRA_DIST src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h - src/simix/smx_private.hpp 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/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h src/smpi/colls/colls_private.h src/smpi/colls/smpi_mvapich2_selector_stampede.h src/smpi/private.h + src/smpi/private.hpp src/smpi/smpi_mpi_dt_private.h src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp @@ -84,8 +90,8 @@ set(EXTRA_DIST src/xbt/automaton/parserPromela.tab.cacc src/xbt/automaton/parserPromela.tab.hacc src/xbt/automaton/parserPromela.yacc - src/xbt/backtrace_dummy.c - src/xbt/backtrace_linux.c + src/xbt/backtrace_dummy.cpp + src/xbt/backtrace_linux.cpp src/xbt/dict_private.h src/xbt/ex_interface.h src/xbt/fifo_private.h @@ -209,7 +215,7 @@ set(SMPI_SRC src/smpi/colls/reduce-rab.c src/smpi/colls/scatter-ompi.c src/smpi/colls/scatter-mvapich-two-level.c - src/smpi/colls/smpi_automatic_selector.c + src/smpi/colls/smpi_automatic_selector.cpp src/smpi/colls/smpi_mpich_selector.c src/smpi/colls/smpi_intel_mpi_selector.c src/smpi/colls/smpi_openmpi_selector.c @@ -238,13 +244,15 @@ set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c - src/xbt/config.c - src/xbt/cunit.c - src/xbt/dict.c + src/xbt/backtrace.cpp + src/xbt/config.cpp + src/xbt/cunit.cpp + src/xbt/dict.cpp src/xbt/dict_cursor.c src/xbt/dict_elm.c - src/xbt/dynar.c - src/xbt/ex.c + src/xbt/dynar.cpp + src/xbt/ex.cpp + src/xbt/exception.cpp src/xbt/fifo.c src/xbt/graph.c src/xbt/heap.c @@ -265,25 +273,19 @@ set(XBT_SRC src/xbt/xbt_os_file.c src/xbt/xbt_os_synchro.c src/xbt/xbt_os_time.c - src/xbt/xbt_replay.c - src/xbt/xbt_str.c + src/xbt/xbt_replay.cpp + src/xbt/xbt_str.cpp src/xbt/xbt_strbuff.c src/xbt/xbt_virtu.c src/xbt_modinter.h - ) if(HAVE_MMALLOC) - set(XBT_SRC - ${XBT_SRC} - src/xbt/mmalloc/mm.c - ) + set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c ) endif() -set(NS3_SRC - src/surf/network_ns3.cpp - src/surf/ns3/ns3_simulator.cc - ) +set(NS3_SRC src/surf/network_ns3.cpp + src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC src/surf/AsImpl.cpp @@ -331,13 +333,12 @@ set(SURF_SRC src/surf/ptask_L07.cpp ) -set(SIMIX_GENERATED_SRC - src/simix/popping_generated.cpp - ) +set(SIMIX_GENERATED_SRC src/simix/popping_generated.cpp ) set(SIMIX_SRC src/simix/libsmx.cpp src/simix/smx_context.cpp src/simix/Context.cpp + src/simix/ContextRaw.cpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp @@ -348,48 +349,44 @@ set(SIMIX_SRC 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 + ${SIMIX_GENERATED_SRC} ) -# Don't try to compile our inline assembly with MSVC -if (MSVC) - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/RawContext.cpp) -else() - set(SIMIX_SRC - ${SIMIX_SRC} - src/simix/RawContext.cpp) -endif() - # Boost context may not be available if (HAVE_BOOST_CONTEXTS) set(SIMIX_SRC ${SIMIX_SRC} - src/simix/BoostContext.hpp - src/simix/BoostContext.cpp) + src/simix/ContextBoost.hpp + src/simix/ContextBoost.cpp) else() set(EXTRA_DIST ${EXTRA_DIST} - src/simix/BoostContext.hpp - src/simix/BoostContext.cpp) + src/simix/ContextBoost.hpp + src/simix/ContextBoost.cpp) endif() set(S4U_SRC src/s4u/s4u_actor.cpp src/s4u/s4u_as.cpp - src/s4u/s4u_async.cpp + src/s4u/s4u_activity.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp src/s4u/s4u_file.cpp src/s4u/s4u_host.cpp src/s4u/s4u_mailbox.cpp + src/s4u/s4u_mutex.cpp src/s4u/s4u_storage.cpp ) set(SIMGRID_SRC - src/simgrid/sg_config.c + src/simgrid/sg_config.cpp src/simgrid/host.cpp src/simgrid/util.hpp ) @@ -491,9 +488,7 @@ set(JTRACE_C_SRC src/bindings/java/jtrace.h ) -set(JTRACE_JAVA_SRC - src/bindings/java/org/simgrid/trace/Trace.java -) +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}) @@ -515,6 +510,7 @@ set(TRACING_SRC src/instr/instr_paje_types.cpp src/instr/instr_paje_values.cpp src/instr/instr_private.h + src/instr/instr_smpi.h src/instr/instr_resource_utilization.cpp src/instr/instr_trace.cpp ) @@ -583,8 +579,7 @@ set(MC_SRC src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.h src/mc/mc_comm_pattern.cpp - src/mc/mc_compare.cpp - src/mc/mc_diff.cpp + src/mc/compare.cpp src/mc/mc_dwarf.hpp src/mc/mc_dwarf.cpp src/mc/mc_dwarf_attrnames.cpp @@ -597,7 +592,6 @@ set(MC_SRC src/mc/mc_mmalloc.h src/mc/LivenessChecker.hpp src/mc/LocationList.hpp - src/mc/malloc.hpp src/mc/LocationList.cpp src/mc/LivenessChecker.cpp src/mc/mc_record.cpp @@ -609,7 +603,8 @@ set(MC_SRC src/mc/mc_safety.h src/mc/mc_state.h src/mc/mc_state.cpp - src/mc/mc_visited.cpp + src/mc/VisitedState.cpp + src/mc/VisitedState.hpp src/mc/mc_client_api.cpp src/mc/mc_protocol.h src/mc/mc_protocol.cpp @@ -618,10 +613,10 @@ set(MC_SRC src/mc/mc_xbt.hpp src/mc/mc_xbt.cpp src/mc/mc_exit.h + src/mc/Transition.hpp ) -set(MC_SIMGRID_MC_SRC - src/mc/simgrid_mc.cpp) +set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp) set(headers_to_install include/msg/msg.h @@ -644,18 +639,21 @@ set(headers_to_install include/simgrid/s4u/forward.hpp include/simgrid/s4u/actor.hpp include/simgrid/s4u/As.hpp - include/simgrid/s4u/async.hpp + include/simgrid/s4u/Activity.hpp include/simgrid/s4u/comm.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/storage.hpp include/simgrid/s4u.h include/simgrid/plugins/energy.h include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_main.h + include/smpi/smpi_extended_traces.h + include/smpi/smpi_extended_traces_fortran.h include/surf/surf_routing.h include/xbt.h include/xbt/RngStream.h @@ -664,6 +662,7 @@ set(headers_to_install include/xbt/automaton.hpp include/xbt/base.h include/xbt/config.h + include/xbt/config.hpp include/xbt/cunit.h include/xbt/dict.h include/xbt/string.hpp @@ -671,14 +670,20 @@ set(headers_to_install include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h + 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 + include/xbt/future.hpp include/xbt/graph.h include/xbt/heap.h include/xbt/lib.h include/xbt/Extendable.hpp include/xbt/log.h + include/xbt/log.hpp include/xbt/mallocator.h include/xbt/matrix.h include/xbt/memory.hpp @@ -705,41 +710,24 @@ 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/ThreadContext.cpp - src/simix/ThreadContext.hpp - ) + set(SURF_SRC ${SURF_SRC} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) else() # NOT pthread - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/ThreadContext.cpp - src/simix/ThreadContext.hpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) endif() if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC - ${SURF_SRC} - src/xbt/xbt_os_thread.c - ) + set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c) else() # NOT pthread - set(EXTRA_DIST - ${EXTRA_DIST} - src/xbt/xbt_os_thread.c + set(EXTRA_DIST ${EXTRA_DIST} src/xbt/xbt_os_thread.c ) endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC - ${SURF_SRC} - src/simix/UContext.cpp - ) + set(SURF_SRC ${SURF_SRC} src/simix/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/UContext.cpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextUnix.cpp) endif() ### Simgrid Lib sources @@ -778,8 +766,8 @@ endif() if(WIN32) set(simgrid_sources ${simgrid_sources} - src/simix/ThreadContext.cpp - src/simix/ThreadContext.hpp + src/simix/ContextThread.cpp + src/simix/ContextThread.hpp src/xbt/xbt_os_thread.c ) endif() @@ -808,15 +796,16 @@ set(DOC_SOURCES doc/triva-time_interval.svg doc/doxygen/FAQ.doc - doc/doxygen/advanced.doc - doc/doxygen/bindings.doc - doc/doxygen/contributing.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/getting_started_index.doc doc/doxygen/header.html - doc/doxygen/help.doc doc/doxygen/index.doc doc/doxygen/inside.doc doc/doxygen/inside_tests.doc @@ -825,7 +814,10 @@ set(DOC_SOURCES doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/install.doc + doc/doxygen/install_yours.doc + doc/doxygen/java.doc doc/doxygen/tutorial.doc + doc/doxygen/models.doc doc/doxygen/module-msg.doc doc/doxygen/module-sd.doc doc/doxygen/module-simix.doc @@ -833,13 +825,18 @@ set(DOC_SOURCES doc/doxygen/module-surf.doc doc/doxygen/module-trace.doc doc/doxygen/module-xbt.doc - doc/doxygen/modules.doc + 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/platform.doc - doc/doxygen/pls.doc + doc/doxygen/platform_lua.doc + doc/doxygen/scenario.doc doc/doxygen/stylesheet.css - doc/doxygen/tracing.doc - doc/doxygen/examples.doc + doc/doxygen/uhood.doc doc/manpage/smpicc.1 doc/manpage/smpicxx.1 @@ -868,7 +865,6 @@ set(DOC_FIGS set(DOC_TOOLS tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/index_create.pl tools/doxygen/xbt_log_extract_hierarchy.pl tools/doxygen/list_routing_models_examples.sh ) @@ -883,7 +879,6 @@ set(DOC_IMG ${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/DiscoveringSimgrid.gif ${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 @@ -924,16 +919,7 @@ set(txt_files # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT examples/java/CMakeLists.txt - examples/java/async/CMakeLists.txt - examples/java/cloud/CMakeLists.txt - examples/java/cloud/energy/CMakeLists.txt - examples/java/cloud/migration/CMakeLists.txt - examples/java/mutualExclusion/CMakeLists.txt - examples/java/pingPong/CMakeLists.txt - examples/java/priority/CMakeLists.txt - examples/java/tracing/CMakeLists.txt examples/msg/CMakeLists.txt - examples/msg/cloud/CMakeLists.txt examples/msg/mc/CMakeLists.txt examples/s4u/CMakeLists.txt examples/simdag/CMakeLists.txt @@ -1005,11 +991,11 @@ set(CMAKE_SOURCE_FILES tools/cmake/MakeLibWin.cmake tools/cmake/Modules/FindGFortran.cmake tools/cmake/Modules/FindGraphviz.cmake - tools/cmake/Modules/FindLibSigc++.cmake tools/cmake/Modules/FindLibdw.cmake tools/cmake/Modules/FindLibunwind.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 @@ -1022,7 +1008,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/IPC/Run/Win32IO.pm tools/cmake/scripts/IPC/Run/Win32Pump.pm tools/cmake/scripts/Diff.pm - tools/cmake/scripts/generate_memcheck_tests.pl tools/cmake/scripts/my_valgrind.pl tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake @@ -1039,6 +1024,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_thread_storage.c tools/cmake/test_prog/prog_vsnprintf.c tools/cmake/cross-mingw.cmake + tools/smpi/generate_smpi_defines.pl tools/stack-cleaner/as tools/stack-cleaner/cc tools/stack-cleaner/c++ @@ -1049,7 +1035,6 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/2clusters.xml examples/platforms/bypassASroute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml @@ -1057,7 +1042,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml - examples/platforms/clusters_routing_full.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf @@ -1108,9 +1092,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_harvard.syscoord 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.xml examples/platforms/two_hosts_platform_shared.xml examples/platforms/two_hosts_platform_with_availability.xml examples/platforms/two_hosts_platform_with_availability_included.xml