X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f531aa69f09fed380e2e212df5822874aab5e58..0cf32d6dd8da963c0789453dcf1302a39d24d45b:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 7e9bd31d89..c4bb70c858 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -16,7 +16,6 @@ set(EXTRA_DIST src/include/surf/random_mgr.h src/include/surf/surf.h src/include/surf/surfxml_parse_values.h - src/include/surf/trace_mgr.h src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h src/msg/msg_mailbox.h @@ -26,18 +25,19 @@ set(EXTRA_DIST src/simdag/dax.dtd src/simdag/dax_dtd.c src/simdag/dax_dtd.h - src/simdag/private.h + src/simdag/simdag_private.h src/simix/simcalls.in src/simix/simcalls.py src/simix/popping_private.h - src/simix/popping_bodies.c - src/simix/popping_generated.c + src/simix/popping_bodies.cpp + src/simix/popping_generated.cpp src/simix/popping_enum.h src/simix/popping_accessors.h src/simix/smx_host_private.h 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/smpi/README @@ -62,6 +62,7 @@ set(EXTRA_DIST src/surf/ns3/ns3_simulator.h src/surf/ns3/red-queue.h src/surf/platf_generator_private.h + src/surf/platform.hpp src/surf/plugins/energy.hpp src/surf/simgrid.dtd src/surf/simgrid_dtd.c @@ -81,8 +82,8 @@ set(EXTRA_DIST src/surf/surf_routing_private.hpp src/surf/surf_routing_vivaldi.hpp src/surf/surfxml_parse.c - src/surf/trace_mgr_private.h src/surf/vm_hl13.hpp + src/surf/PropertyHolder.hpp src/surf/virtual_machine.hpp src/surf/host_clm03.hpp src/surf/host_interface.hpp @@ -120,6 +121,7 @@ set(EXTRA_DIST src/xbt/probes.h src/xbt/win32_ucontext.c tools/tesh/generate_tesh + tools/lualib.patch examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh ) @@ -269,20 +271,18 @@ set(XBT_SRC src/xbt/memory_map.cpp src/xbt/memory_map.hpp src/xbt/parmap.cpp - src/xbt/set.c 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 src/xbt/xbt_main.c src/xbt/xbt_matrix.c - src/xbt/xbt_os_time.c src/xbt/xbt_os_file.c - src/xbt/xbt_peer.c - src/xbt/xbt_queue.c + src/xbt/xbt_os_synchro.c + src/xbt/xbt_os_time.c src/xbt/xbt_replay.c - src/xbt/xbt_sg_synchro.c src/xbt/xbt_sha.c src/xbt/xbt_str.c src/xbt/xbt_strbuff.c @@ -307,11 +307,13 @@ set(NS3_SRC ) set(SURF_SRC + src/surf/callbacks.h + src/surf/callbacks.cpp src/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp src/surf/fair_bottleneck.cpp - src/surf/instr_routing.c + src/surf/instr_routing.cpp src/surf/instr_surf.c src/surf/lagrange.cpp src/surf/maxmin.cpp @@ -322,8 +324,9 @@ set(SURF_SRC src/surf/network_ib.cpp src/surf/platf_generator.c src/surf/plugins/energy.cpp + src/surf/PropertyHolder.cpp src/surf/random_mgr.c - src/surf/sg_platf.c + src/surf/sg_platf.cpp src/surf/storage_interface.cpp src/surf/storage_n11.cpp src/surf/surf_c_bindings.cpp @@ -339,8 +342,9 @@ set(SURF_SRC src/surf/surf_routing_none.cpp src/surf/surf_routing_vivaldi.cpp src/surf/surfxml_parse.c - src/surf/surfxml_parseplatf.c - src/surf/trace_mgr.c + src/surf/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 @@ -350,22 +354,22 @@ set(SURF_SRC ) set(SIMIX_GENERATED_SRC - src/simix/popping_generated.c + src/simix/popping_generated.cpp ) set(SIMIX_SRC - src/simix/libsmx.c - src/simix/smx_context.c - src/simix/smx_context_base.c - src/simix/smx_deployment.c - src/simix/smx_environment.c - src/simix/smx_global.c - src/simix/smx_host.c - src/simix/smx_io.c - src/simix/smx_network.c - src/simix/smx_process.c - src/simix/smx_synchro.c - src/simix/smx_vm.c - src/simix/popping.c + src/simix/libsmx.cpp + src/simix/smx_context.cpp + src/simix/Context.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/smx_synchro.cpp + src/simix/smx_vm.cpp + src/simix/popping.cpp ${SIMIX_GENERATED_SRC} ) @@ -374,22 +378,24 @@ set(SIMIX_SRC if (MSVC) set(EXTRA_DIST ${EXTRA_DIST} - src/simix/smx_context_raw.c) + src/simix/RawContext.cpp) else() set(SIMIX_SRC ${SIMIX_SRC} - src/simix/smx_context_raw.c) + src/simix/RawContext.cpp) endif() # Boost context may not be available if (HAVE_BOOST_CONTEXT) set(SIMIX_SRC ${SIMIX_SRC} - src/simix/smx_context_boost.cpp) + src/simix/BoostContext.hpp + src/simix/BoostContext.cpp) else() set(EXTRA_DIST ${EXTRA_DIST} - src/simix/smx_context_boost.cpp) + src/simix/BoostContext.hpp + src/simix/BoostContext.cpp) endif() set(S4U_SRC @@ -410,122 +416,75 @@ set(SIMGRID_SRC ) set(MSG_SRC - src/msg/instr_msg_process.c - src/msg/instr_msg_task.c - src/msg/instr_msg_vm.c - src/msg/msg_actions.c - src/msg/msg_deployment.c - src/msg/msg_environment.c - src/msg/msg_global.c - src/msg/msg_gos.c - src/msg/msg_host.c - src/msg/msg_io.c - src/msg/msg_mailbox.c - src/msg/msg_process.c - src/msg/msg_synchro.c - src/msg/msg_task.c - src/msg/msg_vm.c + 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 + 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 - src/simdag/instr_sd_task.c - src/simdag/sd_daxloader.c - src/simdag/sd_global.c - src/simdag/sd_link.c - src/simdag/sd_task.c - src/simdag/sd_workstation.c + src/simdag/sd_daxloader.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.c + ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp ) else() set(EXTRA_DIST - ${EXTRA_DIST} src/simdag/sd_dotloader.c + ${EXTRA_DIST} src/simdag/sd_dotloader.cpp ) endif() set(BINDINGS_SRC src/bindings/bindings_global.c src/bindings/lua/lua_private.h - src/bindings/lua/lua_state_cloner.h src/bindings/lua/lua_utils.h src/bindings/lua/simgrid_lua.h ) -set(JSURF_SWIG_SRC - src/bindings/java/surf.i -) - -set(JSURF_SWIG_SRC_EXTRA - src/bindings/java/surfdoc.i -) - -set(JSURF_JAVA_C_SRC - src/bindings/java/surf_swig.cpp - src/bindings/java/surf_swig.hpp -) - -set(JSURF_JAVA_GENERATED_SRC - src/bindings/java/org/simgrid/surf/Action.java - src/bindings/java/org/simgrid/surf/ActionList.java - src/bindings/java/org/simgrid/surf/ActionState.java - src/bindings/java/org/simgrid/surf/Cpu.java - src/bindings/java/org/simgrid/surf/CpuAction.java - src/bindings/java/org/simgrid/surf/CpuModel.java - src/bindings/java/org/simgrid/surf/LmmConstraint.java - src/bindings/java/org/simgrid/surf/LmmVariable.java - src/bindings/java/org/simgrid/surf/Model.java - src/bindings/java/org/simgrid/surf/NetworkAction.java - src/bindings/java/org/simgrid/surf/Link.java - src/bindings/java/org/simgrid/surf/Plugin.java - src/bindings/java/org/simgrid/surf/Resource.java - src/bindings/java/org/simgrid/surf/ResourceState.java - src/bindings/java/org/simgrid/surf/RoutingEdge.java - src/bindings/java/org/simgrid/surf/Surf.java - src/bindings/java/org/simgrid/surf/SurfJNI.java - src/bindings/java/org/simgrid/surf/TmgrTrace.java - src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java - src/bindings/java/org/simgrid/surf/XbtDict.java -) - set(JMSG_C_SRC - src/bindings/java/jmsg.c + src/bindings/java/jmsg.cpp src/bindings/java/jmsg.h - src/bindings/java/jmsg_as.c + src/bindings/java/jmsg_as.cpp src/bindings/java/jmsg_as.h - src/bindings/java/jmsg_comm.c + src/bindings/java/jmsg_comm.cpp src/bindings/java/jmsg_comm.h - src/bindings/java/jmsg_file.c + src/bindings/java/jmsg_file.cpp src/bindings/java/jmsg_file.h - src/bindings/java/jmsg_host.c + src/bindings/java/jmsg_host.cpp src/bindings/java/jmsg_host.h - src/bindings/java/jmsg_process.c + src/bindings/java/jmsg_process.cpp src/bindings/java/jmsg_process.h - src/bindings/java/jmsg_rngstream.c + src/bindings/java/jmsg_rngstream.cpp src/bindings/java/jmsg_rngstream.h - src/bindings/java/jmsg_synchro.c + src/bindings/java/jmsg_synchro.cpp src/bindings/java/jmsg_synchro.h - src/bindings/java/jmsg_task.c + src/bindings/java/jmsg_task.cpp src/bindings/java/jmsg_task.h - src/bindings/java/jmsg_vm.c + src/bindings/java/jmsg_vm.cpp src/bindings/java/jmsg_vm.h - src/bindings/java/jxbt_utilities.c + src/bindings/java/jxbt_utilities.cpp src/bindings/java/jxbt_utilities.h - src/bindings/java/smx_context_cojava.c - src/bindings/java/smx_context_cojava.h - src/bindings/java/smx_context_java.c - src/bindings/java/smx_context_java.h - src/bindings/java/jmsg_storage.c + src/bindings/java/JavaContext.cpp + src/bindings/java/JavaContext.hpp + src/bindings/java/jmsg_storage.cpp src/bindings/java/jmsg_storage.h ) -set(JSURF_C_SRC - src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx - src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h - ${JSURF_JAVA_C_SRC} -) - set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/NativeLib.java src/bindings/java/org/simgrid/msg/As.java @@ -551,11 +510,10 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/TimeoutException.java src/bindings/java/org/simgrid/msg/TransferFailureException.java src/bindings/java/org/simgrid/msg/VM.java - ${JSURF_JAVA_GENERATED_SRC} ) set(JTRACE_C_SRC - src/bindings/java/jtrace.c + src/bindings/java/jtrace.cpp src/bindings/java/jtrace.h ) @@ -568,28 +526,24 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) set(LUA_SRC src/bindings/lua/factories/host.lua - src/bindings/lua/lua_comm.c src/bindings/lua/lua_host.c src/bindings/lua/lua_platf.c - src/bindings/lua/lua_process.c - src/bindings/lua/lua_state_cloner.c - src/bindings/lua/lua_task.c - src/bindings/lua/lua_utils.c + src/bindings/lua/lua_debug.c src/bindings/lua/simgrid_lua.c ) set(TRACING_SRC - src/instr/instr_TI_trace.c - src/instr/instr_config.c - src/instr/instr_interface.c - src/instr/instr_paje_containers.c - src/instr/instr_paje_header.c - src/instr/instr_paje_trace.c - src/instr/instr_paje_types.c - src/instr/instr_paje_values.c + src/instr/instr_TI_trace.cpp + src/instr/instr_config.cpp + src/instr/instr_interface.cpp + src/instr/instr_paje_containers.cpp + src/instr/instr_paje_header.cpp + src/instr/instr_paje_trace.cpp + src/instr/instr_paje_types.cpp + src/instr/instr_paje_values.cpp src/instr/instr_private.h - src/instr/instr_resource_utilization.c - src/instr/instr_trace.c + src/instr/instr_resource_utilization.cpp + src/instr/instr_trace.cpp ) set(JEDULE_SRC @@ -659,7 +613,6 @@ set(MC_SRC src/mc/mc_hash.hpp src/mc/mc_hash.cpp src/mc/mc_ignore.cpp - src/mc/mcer_ignore.cpp src/mc/mc_ignore.h src/mc/mc_liveness.h src/mc/LocationList.hpp @@ -698,18 +651,21 @@ set(headers_to_install include/simdag/simdag.h include/simdag/datatypes.h + 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 include/simgrid/platf.h include/simgrid/platf_generator.h - include/simgrid/plugins.h include/simgrid/simix.h + include/simgrid/simix.hpp include/simgrid/host.h include/simgrid/link.h + include/simgrid/s4u/forward.hpp include/simgrid/s4u/actor.hpp include/simgrid/s4u/async.hpp include/simgrid/s4u/comm.hpp @@ -719,6 +675,7 @@ set(headers_to_install include/simgrid/s4u/mailbox.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_cocci.h @@ -735,6 +692,8 @@ set(headers_to_install include/xbt/config.h include/xbt/cunit.h include/xbt/dict.h + include/xbt/string.hpp + include/xbt/signal.hpp include/xbt/dynar.h include/xbt/ex.h include/xbt/fifo.h @@ -746,6 +705,7 @@ set(headers_to_install include/xbt/hash.h include/xbt/heap.h include/xbt/lib.h + include/xbt/Extendable.hpp include/xbt/log.h include/xbt/mallocator.h include/xbt/matrix.h @@ -753,10 +713,7 @@ set(headers_to_install include/xbt/mmalloc.h include/xbt/module.h include/xbt/parmap.h - include/xbt/peer.h - include/xbt/queue.h include/xbt/replay.h - include/xbt/set.h include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h @@ -776,13 +733,25 @@ set(source_of_generated_headers if(${CONTEXT_THREADS}) #pthread set(SURF_SRC ${SURF_SRC} - src/simix/smx_context_thread.c + src/simix/ThreadContext.cpp + src/simix/ThreadContext.hpp + ) +else() # NOT pthread + set(EXTRA_DIST + ${EXTRA_DIST} + src/simix/ThreadContext.cpp + src/simix/ThreadContext.hpp + ) +endif() + +if(${CONTEXT_THREADS}) #pthread + set(SURF_SRC + ${SURF_SRC} src/xbt/xbt_os_thread.c ) else() # NOT pthread set(EXTRA_DIST ${EXTRA_DIST} - src/simix/smx_context_thread.c src/xbt/xbt_os_thread.c ) endif() @@ -790,12 +759,12 @@ endif() if(${CONTEXT_UCONTEXT}) #ucontext set(SURF_SRC ${SURF_SRC} - src/simix/smx_context_sysv.c + src/simix/UContext.cpp ) else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} - src/simix/smx_context_sysv.c + src/simix/UContext.cpp ) endif() @@ -858,7 +827,8 @@ endif() if(WIN32) set(simgrid_sources ${simgrid_sources} - src/simix/smx_context_thread.c + src/simix/ThreadContext.cpp + src/simix/ThreadContext.hpp src/xbt/win32_ucontext.c src/xbt/xbt_os_thread.c ) @@ -908,14 +878,14 @@ set(DOC_SOURCES doc/doxygen/header.html doc/doxygen/help.doc doc/doxygen/index.doc - doc/doxygen/inside_ci.doc + doc/doxygen/inside.doc + doc/doxygen/inside_tests.doc doc/doxygen/inside_cmake.doc doc/doxygen/inside_doxygen.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/install.doc - doc/doxygen/internals.doc - doc/doxygen/introduction.doc + doc/doxygen/tutorial.doc doc/doxygen/module-msg.doc doc/doxygen/module-sd.doc doc/doxygen/module-simix.doc @@ -947,11 +917,6 @@ set(DOC_SOURCES doc/msg-tuto-src/masterworker2.c doc/msg-tuto-src/masterworker3.c doc/msg-tuto-src/masterworker4.c - doc/msg-tuto-src/platforms/cloud.xml - doc/msg-tuto-src/platforms/g5k.xml - doc/msg-tuto-src/platforms/griffon.xml - doc/msg-tuto-src/platforms/peers.xml - doc/msg-tuto-src/platforms/platform.xml CITATION.bib ) @@ -988,12 +953,6 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_pair_16.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_ring_16.png ) @@ -1010,6 +969,7 @@ set(bin_files set(txt_files ${txt_files} + .appveyor-download.cmd AUTHORS COPYING README @@ -1030,8 +990,10 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/bittorrent/CMakeLists.txt examples/java/chord/CMakeLists.txt examples/java/cloud/CMakeLists.txt + examples/java/cloud/energy/CMakeLists.txt examples/java/cloud/migration/CMakeLists.txt examples/java/commTime/CMakeLists.txt + examples/java/energy/CMakeLists.txt examples/java/io/CMakeLists.txt examples/java/kademlia/CMakeLists.txt examples/java/master_slave_bypass/CMakeLists.txt @@ -1041,13 +1003,9 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/mutualExclusion/CMakeLists.txt examples/java/pingPong/CMakeLists.txt examples/java/priority/CMakeLists.txt - examples/java/reservationSurfPlugin/CMakeLists.txt examples/java/startKillTime/CMakeLists.txt - examples/java/surfCpuModel/CMakeLists.txt - examples/java/surfPlugin/CMakeLists.txt examples/java/suspend/CMakeLists.txt examples/java/tracing/CMakeLists.txt - examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt examples/msg/bittorrent/CMakeLists.txt @@ -1107,6 +1065,7 @@ set(EXAMPLES_CMAKEFILES_TXT set(TESHSUITE_CMAKEFILES_TXT teshsuite/bug-17132/CMakeLists.txt teshsuite/java/CMakeLists.txt + teshsuite/java/semaphore/CMakeLists.txt teshsuite/java/sleep_host_off/CMakeLists.txt teshsuite/lua/lua_platforms.tesh teshsuite/mc/CMakeLists.txt @@ -1249,7 +1208,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in - tools/cmake/src/simgrid.nsi.in tools/cmake/test_prog/prog_AC_CHECK_MCSC.c tools/cmake/test_prog/prog_gnu_dynlinker.c tools/cmake/test_prog/prog_mutex_timedlock.c @@ -1288,6 +1246,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml + examples/platforms/trace/linkBandwidth7.bw examples/platforms/trace/trace_A_failure.txt examples/platforms/trace/trace_A.txt examples/platforms/trace/trace_B.txt @@ -1308,6 +1267,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua 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