X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f54f95c01d108028c7c75dbf64c8fd507c723a0..0a6a4bd48476ef1840bdd773ac0683c4452bf416:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index e61b383588..286d9b2231 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -17,7 +17,7 @@ set(EXTRA_DIST src/xbt/backtrace_windows.c src/xbt/backtrace_dummy.c src/xbt/setset_private.h - src/xbt/threadpool_private.h + src/xbt/parmap_private.h src/xbt/mmalloc/attach.c src/xbt/mmalloc/detach.c src/xbt/mmalloc/keys.c @@ -62,8 +62,6 @@ set(EXTRA_DIST src/include/xbt/xbt_os_thread.h src/include/mc/datatypes.h src/include/mc/mc.h - src/include/simix/simix.h - src/include/simix/datatypes.h src/include/simix/context.h src/msg/private.h src/msg/mailbox.h @@ -82,10 +80,13 @@ set(EXTRA_DIST src/amok/Bandwidth/bandwidth_private.h src/amok/amok_modinter.h src/simix/private.h - src/simix/smx_context_private.h - src/simix/smx_context_java.h + src/simix/process_private.h + src/simix/host_private.h + src/simix/network_private.h + src/simix/smurf_private.h + src/simix/synchro_private.h + src/smpi/private.h - src/smpi/smpi_coll_private.h src/smpi/smpi_mpi_dt_private.h src/smpi/README src/mk_supernovae.pl @@ -110,45 +111,10 @@ set(SMPI_SRC src/smpi/smpi_f77.c src/smpi/smpi_comm.c src/smpi/smpi_group.c - src/smpi/smpi_util.c src/smpi/smpi_coll.c src/smpi/smpi_mpi_dt.c ) -set(JMSG_C_SRC - src/simix/smx_context_java.c - src/java/jxbt_utilities.c - src/java/jxbt_utilities.h - src/java/jmsg.c - src/java/jmsg.h - src/java/jmsg_host.c - src/java/jmsg_host.h - src/java/jmsg_process.c - src/java/jmsg_process.h - src/java/jmsg_task.c - src/java/jmsg_task.h - src/java/jmsg_application_handler.c - src/java/jmsg_application_handler.h -) - -set(JMSG_JAVA_SRC - src/java/simgrid/msg/ApplicationHandler.java - src/java/simgrid/msg/Host.java - src/java/simgrid/msg/HostFailureException.java - src/java/simgrid/msg/HostNotFoundException.java - src/java/simgrid/msg/JniException.java - src/java/simgrid/msg/Msg.java - src/java/simgrid/msg/MsgException.java - src/java/simgrid/msg/MsgNative.java - src/java/simgrid/msg/NativeException.java - src/java/simgrid/msg/Process.java - src/java/simgrid/msg/ProcessNotFoundException.java - src/java/simgrid/msg/Sem.java - src/java/simgrid/msg/Task.java - src/java/simgrid/msg/TaskCancelledException.java - src/java/simgrid/msg/TimeoutException.java - src/java/simgrid/msg/TransferFailureException.java -) set(GRAS_RL_SRC src/gras/rl_stubs.c @@ -198,7 +164,8 @@ set(XBT_SRC src/xbt/cunit.c src/xbt/graphxml_parse.c src/xbt/setset.c - src/xbt/threadpool.c + src/xbt/parmap.c + src/xbt/xbt_replay_trace_reader.c ) if(HAVE_MMAP) @@ -229,7 +196,7 @@ set(SURF_SRC src/surf/surfxml_parse.c src/surf/cpu.c src/surf/network.c - src/surf/network_vivaldi.c + src/surf/network_im.c src/surf/network_constant.c src/surf/workstation.c src/surf/workstation_ptask_L07.c @@ -250,6 +217,7 @@ set(SIMIX_SRC src/simix/smx_context_base.c src/simix/smx_user.c src/simix/smx_smurf.c + src/simix/smx_context_raw.c ) set(MSG_SRC @@ -331,21 +299,20 @@ set(LUA_SRC ) set(TRACING_SRC + src/instr/instr_routing.c src/instr/instr_config.c - src/instr/categories.c - src/instr/interface.c - src/instr/general.c - src/instr/paje.c - src/instr/msg_task_instr.c - src/instr/msg_process_instr.c - src/instr/msg_volume.c - src/instr/smx_instr.c - src/instr/surf_instr.c - src/instr/smpi_instr.c - src/instr/sd_instr.c - src/instr/variables_instr.c - src/instr/resource_utilization.c - src/instr/private.h + src/instr/instr_interface.c + src/instr/instr_paje.c + src/instr/instr_paje_trace.c + src/instr/instr_msg_task.c + src/instr/instr_msg_process.c + src/instr/instr_msg_volume.c + src/instr/instr_smx.c + src/instr/instr_surf.c + src/instr/instr_smpi.c + src/instr/instr_simdag.c + src/instr/instr_resource_utilization.c + src/instr/instr_private.h ) set(RUBY_SRC @@ -399,6 +366,8 @@ set(install_HEADERS include/xbt/queue.h include/xbt/setset.h include/xbt/mmalloc.h + include/xbt/replay_trace_reader.h + include/xbt/parmap.h include/mc/modelchecker.h include/msg/msg.h include/msg/datatypes.h @@ -424,41 +393,38 @@ set(install_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h include/gras.h include/xbt.h + include/simix/simix.h + include/simix/datatypes.h + include/simix/context.h ) ### depend of some variables setted upper -# -->CONTEXT_THREADS +# -->CONTEXT_THREADS CONTEXT_UCONTEXT if(${CONTEXT_THREADS}) #pthread set(SURF_SRC ${SURF_SRC} src/xbt/xbt_os_thread.c src/simix/smx_context_thread.c - ) + ) +else(${CONTEXT_THREADS}) # NOT pthread set(EXTRA_DIST ${EXTRA_DIST} - src/simix/smx_context_sysv.c - ) -else(${CONTEXT_THREADS}) #ucontext + src/xbt/xbt_os_thread.c + src/simix/smx_context_thread.c + ) +endif(${CONTEXT_THREADS}) + +if(${CONTEXT_UCONTEXT}) #ucontext set(SURF_SRC ${SURF_SRC} src/simix/smx_context_sysv.c ) - - if(WIN32) - set(SURF_SRC - ${SURF_SRC} - src/xbt/xbt_os_thread.c - src/simix/smx_context_thread.c) - else(WIN32) - set(EXTRA_DIST - ${EXTRA_DIST} - src/xbt/xbt_os_thread.c - src/simix/smx_context_thread.c) - endif(WIN32) -endif(${CONTEXT_THREADS}) - - - +else(${CONTEXT_UCONTEXT}) # NOT ucontext + set(EXTRA_DIST + ${EXTRA_DIST} + src/simix/smx_context_sysv.c + ) +endif(${CONTEXT_UCONTEXT}) # -->HAVE_GTNETS if(HAVE_GTNETS) @@ -515,21 +481,6 @@ elseif(${HAVE_LUA}) ) endif(${HAVE_LUA}) -set(EXTRA_DIST - ${EXTRA_DIST} - ${JMSG_JAVA_SRC} -) -if(${HAVE_JAVA}) - set(simgrid_sources - ${simgrid_sources} - ${JMSG_C_SRC} # add the binding support to the library - ) -else(${HAVE_JAVA}) - set(EXTRA_DIST - ${EXTRA_DIST} - ${JMSG_C_SRC} - ) -endif(${HAVE_JAVA}) if(${HAVE_RUBY}) set(simgrid_sources @@ -555,7 +506,6 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*.lua" "examples/*.java" "examples/*.xml" -"examples/*.txt" ) file(GLOB_RECURSE README_examples_files @@ -695,7 +645,6 @@ file(GLOB_RECURSE add_src_files "tools/*CMakeLists.txt" "examples/*.c" "examples/*.cxx" -"examples/*.java" "examples/*.lua" "examples/*.rb" "examples/*CMakeLists.txt" @@ -744,11 +693,20 @@ file(GLOB_RECURSE tesh_files "tools/*.tesh" ) -file(GLOB_RECURSE txt_files -"testsuite/surf/trace*.txt" -"testsuite/simdag/availability_tremblay.txt" +set(txt_files +"testsuite/surf/trace_A_failure.txt" +"testsuite/surf/trace_A.txt" +"testsuite/surf/trace_B.txt" "examples/smpi/hostfile" -"examples/msg/*.trace" +"examples/msg/procmig.trace" +"examples/msg/volume.trace" +"examples/msg/ms.trace" +"examples/msg/trace/file.trace" +"examples/msg/link5_state.trace" +"examples/msg/categories.trace" +"examples/msg/tasks.trace" +"examples/msg/fafard_state.trace" +"examples/msg/jupiter_state.trace" "examples/msg/actions/actions_allReduce.txt" "examples/msg/actions/actions_reduce.txt" "examples/msg/actions/actions.txt" @@ -759,12 +717,9 @@ file(GLOB_RECURSE txt_files "examples/msg/actions/actions_split_p1.txt" "examples/msg/actions/CMakeLists.txt" "examples/msg/migration/migration.deploy" -"examples/java/runtest" "teshsuite/gras/datadesc/datadesc.little32_4" "teshsuite/gras/datadesc/datadesc.little64" -"teshsuite/gras/datadesc/datadesc.big32_8" "teshsuite/gras/datadesc/datadesc.big32_8_4" -"teshsuite/gras/datadesc/datadesc.big32_2" "teshsuite/gras/datadesc/mk_datadesc_structs.pl" "teshsuite/gras/msg_handle/test_rl" "teshsuite/gras/msg_handle/test_sg_32" @@ -810,10 +765,6 @@ file(GLOB_RECURSE txt_files "examples/gras/pmm/test_sg_64" "examples/gras/synchro/test_sg_64" "examples/gras/properties/test_sg" -"examples/java/basic/BasicTest" -"examples/java/ping_pong/PingPongTest" -"examples/java/comm_time/CommTimeTest" -"examples/java/suspend/SuspendTest" ) set(txt_files @@ -824,6 +775,8 @@ set(txt_files LICENSE-LGPL-2.1 NEWS TODO + configure + INSTALL ) file(GLOB_RECURSE README_files @@ -846,6 +799,7 @@ set(bin_files tools/MSG_visualization/colorize.pl tools/sg_unit_extractor.pl tools/simgrid_update_xml.pl +buildtools/Cmake/tesh.pl ) # This is the complete lise of what will be added to the source archive @@ -853,8 +807,6 @@ set(source_to_pack ${XBT_RL_SRC} ${EXTRA_DIST} ${SMPI_SRC} - ${JMSG_C_SRC} - ${JMSG_JAVA_SRC} ${GRAS_RL_SRC} ${XBT_SRC} ${GTNETS_SRC}