X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcb0af8b6fab2d05361157b04ce25541790b91eb..1533cc141a67f967feebfe52885d63194737200c:/examples/s4u/CMakeLists.txt

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 0fb122df1d..663a1cd0c1 100644
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -1,15 +1,24 @@
 
-# Regular examples: with only one source and tested with all factories
-######################################################################
+# Regular examples: with only one source and tested with all factories by default
+#################################################################################
+set(_actor-stacksize_factories "raw;boost;ucontext") # Threads ignore modifications of the stack size
+
+# The maestro-set example only works for threads and when not using windows.
+set(_maestro-set_factories "thread")
+if(WIN32)
+  set(_maestro-set_disable 1)
+endif()
 
 foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill
-                 actor-lifetime actor-migrate actor-suspend actor-yield
+                 actor-lifetime actor-migrate actor-suspend actor-yield actor-stacksize
                  app-chainsend app-pingpong app-token-ring
                  async-ready async-wait async-waitany async-waitall async-waituntil
+                 comm-dependent
                  cloud-capping cloud-migration cloud-simple
                  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
                  io-async io-file-system io-file-remote io-disk-raw io-dependent
                  platform-failures platform-profile platform-properties
                  plugin-hostload
@@ -23,12 +32,25 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill
 
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.tesh)
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.cpp)
-  
-  ADD_TESH_FACTORIES(s4u-${example} "thread;ucontext;raw;boost"
-                                    --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)
+
+  # Use default factories unless specified otherwise
+  if(NOT DEFINED _${example}_factories)
+    set(_${example}_factories "thread;ucontext;raw;boost")
+  endif()
+#  message("Factories of ${example}: ${_${example}_factories}")
+
+  if(NOT DEFINED _${example}_disabled)
+    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)
+  else()
+    message(STATUS "Example disabled on this system/architecture")
+    unset(_${example}_disabled)
+  endif()
+
+  unset(_${example}_factories)
 endforeach()
 
 
@@ -101,6 +123,16 @@ foreach (file s4u-bittorrent s4u-peer s4u-tracker)
                                      ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.hpp)
 endforeach()
 
+# The tests of DHT, along with the parallel variant
+
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+  # Thread-local storage (TLS) is needed for parallel execution, but it doesn't
+  # play well with Ucontexts on 64bit SunOS (at least on x86_64).
+  set(parallel-factories "thread;raw;boost")
+else()
+  set(parallel-factories "thread;ucontext;raw;boost")
+endif()
+
 foreach(example app-bittorrent app-masterworkers 
                 dht-chord dht-kademlia
                 )
@@ -109,6 +141,12 @@ foreach(example app-bittorrent app-masterworkers
 				    --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
 				    --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example} 
 				    ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh)
+
+  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)
 endforeach()
 
 # Examples not accepting factories
@@ -134,26 +172,6 @@ if (NOT enable_memcheck AND NOT WIN32)
                             ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh)
 endif()
 
-# Examples accepting only thread factories
-##################################
-foreach (example maestro-set)
-  add_executable       (s4u-${example} EXCLUDE_FROM_ALL ${example}/s4u-${example}.cpp)
-  target_link_libraries(s4u-${example} simgrid)
-  set_target_properties(s4u-${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
-  add_dependencies(tests s4u-${example})
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.tesh)
-  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/s4u-${example}.cpp)
-
-  if(NOT WIN32)
-    ADD_TESH_FACTORIES(s4u-${example} "thread" --setenv bindir=${CMAKE_CURRENT_BINARY_DIR}/${example}
-                                               --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
-                                               ${CMAKE_HOME_DIRECTORY}/examples/s4u/${example}/s4u-${example}.tesh)
-  else()
-    message("Test maestro-set disabled on windows: this feature is not working")
-  endif()
-endforeach()
-
 # Add all extra files to the archive
 ####################################