X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d51f1c9db075dff6052a1467504cff2cd6174d74..9c4b046a0b348663606b63e1446aba8c77cb2b1a:/examples/s4u/CMakeLists.txt diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 78ff494c20..6320a43544 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -6,9 +6,11 @@ set(_app-bittorrent_sources app-bittorrent/s4u-bittorrent.cpp app-bittorrent/s4u-bittorrent.hpp app-bittorrent/s4u-peer.cpp app-bittorrent/s4u-peer.hpp app-bittorrent/s4u-tracker.cpp app-bittorrent/s4u-tracker.hpp) -set(_dht-chord_sources dht-chord/s4u-dht-chord.cpp dht-chord/s4u-dht-chord-node.cpp) -set(_dht-kademlia_sources dht-kademlia/s4u-dht-kademlia.cpp dht-kademlia/node.cpp - dht-kademlia/routing_table.cpp dht-kademlia/answer.cpp dht-kademlia/message.hpp) +set(_dht-chord_sources dht-chord/s4u-dht-chord.cpp dht-chord/s4u-dht-chord.hpp dht-chord/s4u-dht-chord-node.cpp) +set(_dht-kademlia_sources dht-kademlia/s4u-dht-kademlia.cpp dht-kademlia/s4u-dht-kademlia.hpp + dht-kademlia/node.cpp dht-kademlia/node.hpp + dht-kademlia/routing_table.cpp dht-kademlia/routing_table.hpp + dht-kademlia/answer.cpp dht-kademlia/answer.hpp dht-kademlia/message.hpp) set(_actor-stacksize_factories "raw;boost;ucontext") # Threads ignore modifications of the stack size @@ -18,13 +20,36 @@ if(WIN32) set(_maestro-set_disable 1) endif() -foreach (example mc-failing-assert) +foreach (example mc-bugged1 mc-bugged2 mc-failing-assert mc-electric-fence) if(NOT SIMGRID_HAVE_MC) set(_${example}_disable 1) endif() set(_${example}_factories "ucontext;raw;boost") endforeach() +set(_mc-bugged1-liveness_disable 1) +if(SIMGRID_HAVE_MC) + if(HAVE_C_STACK_CLEANER) + add_executable (s4u-mc-bugged1-liveness-cleaner-on EXCLUDE_FROM_ALL s4u-mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp) + target_link_libraries(s4u-mc-bugged1-liveness-cleaner-on simgrid) + set_target_properties(s4u-mc-bugged1-liveness-cleaner-on PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fstack-cleaner") + add_dependencies(tests s4u-mc-bugged1-liveness-cleaner-on) + + add_executable (s4u-mc-bugged1-liveness-cleaner-off EXCLUDE_FROM_ALL s4u-mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp) + target_link_libraries(s4u-mc-bugged1-liveness-cleaner-off simgrid) + set_target_properties(s4u-mc-bugged1-liveness-cleaner-off PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fno-stack-cleaner") + add_dependencies(tests s4u-mc-bugged1-liveness-cleaner-off) + endif() + +endif() + +if(SIMGRID_HAVE_NS3) + add_executable (s4u-network-ns3 EXCLUDE_FROM_ALL network-ns3/s4u-network-ns3.cpp) + target_link_libraries(s4u-network-ns3 simgrid) + set_target_properties(s4u-network-ns3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3) + add_dependencies(tests s4u-network-ns3) +endif() + # Deal with each example foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill @@ -33,12 +58,12 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill async-ready async-wait async-waitany async-waitall async-waituntil comm-dependent cloud-capping cloud-migration cloud-simple - dht-chord dht-kademlia + dht-chord dht-kademlia energy-exec energy-boot energy-link energy-vm energy-exec-ptask engine-filtering exec-async exec-basic exec-dvfs exec-ptask exec-remote exec-waitany exec-waitfor exec-dependent - maestro-set - mc-failing-assert + maestro-set + mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-electric-fence mc-failing-assert io-async io-file-system io-file-remote io-disk-raw io-dependent platform-failures platform-profile platform-properties plugin-hostload @@ -64,10 +89,10 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill # message("Factories of ${example}: ${_${example}_factories}") ADD_TESH_FACTORIES(s4u-${example} "${_${example}_factories}" - --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} - --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} - ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) + --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} + ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) else() message(STATUS "Example ${example} disabled, thus not compiled.") unset(_${example}_disabled) @@ -97,7 +122,30 @@ foreach(variant fun class) endforeach() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers.tesh) - +# Model-checking liveness +if(SIMGRID_HAVE_MC) + IF(HAVE_UCONTEXT_CONTEXTS AND SIMGRID_PROCESSOR_x86_64) # liveness model-checking works only on 64bits (for now ...) + ADD_TESH(s4u-mc-bugged1-liveness-ucontext --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + --cd ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness + ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.tesh) + + ADD_TESH(s4u-mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + --cd ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness + ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh) + IF(HAVE_C_STACK_CLEANER) + # This test checks if the stack cleaner is making a difference: + ADD_TEST(s4u-mc-bugged1-liveness-stack-cleaner ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner + ${CMAKE_HOME_DIRECTORY}/examples/s4u/mc-bugged1-liveness/ + ${CMAKE_CURRENT_BINARY_DIR}/mc-bugged1-liveness/) + ENDIF() + ENDIF() + + if (enable_coverage) + SET_TESTS_PROPERTIES(mc-bugged1-liveness-visited-ucontext PROPERTIES RUN_SERIAL "TRUE") + endif() +ENDIF() # The tests the parallel variant of of DHTs @@ -114,11 +162,19 @@ foreach(example app-bittorrent app-masterworkers ) ADD_TESH_FACTORIES(s4u-${example}-parallel "${parallel-factories}" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example} - --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms - --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} - ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} + ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh) endforeach() +# ns3-tests +if(SIMGRID_HAVE_NS3) + ADD_TESH_FACTORIES(s4u-network-ns3 "thread;ucontext;raw;boost" + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u + --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3/s4u-network-ns3.tesh) +endif() # Examples not accepting factories ################################## @@ -145,8 +201,10 @@ endif() # Add all extra files to the archive #################################### -set(examples_src ${examples_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh PARENT_SCOPE) +set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.cpp PARENT_SCOPE) +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml @@ -166,8 +224,16 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-a ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/replay-io/s4u-replay-io_d.xml - PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3hosts_2links_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links-timer_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/crosstraffic_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/dogbone_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/onelink_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml PARENT_SCOPE) +set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py + ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-stack-cleaner + ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/promela_bugged1_liveness PARENT_SCOPE) set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split-p0.txt ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm-split-p1.txt ${CMAKE_CURRENT_SOURCE_DIR}/replay-comm/s4u-replay-comm.txt