convert (and simplify a bit) dht-kademlia example

[simgrid.git] / examples / c / CMakeLists.txt

diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
index b354060..8126348 100644 (file)
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -36,6 +36,16 @@ foreach (file chainsend broadcaster peer)
 endforeach()
 set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/chainsend.h)
 
+#DHT-Kademlia
+add_executable       (dht-kademlia-c EXCLUDE_FROM_ALL dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/message.c dht-kademlia/answer.c)
+target_link_libraries(dht-kademlia-c simgrid)
+set_target_properties(dht-kademlia-c PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-kademlia)
+add_dependencies(tests dht-kademlia-c)
+
+foreach (file answer node routing_table message)
+  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.c  ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.h)
+endforeach()
+
 # Add all extra files to the archive
 ####################################
 
@@ -43,8 +53,11 @@ set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
 set(tesh_files    ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-chainsend/app-chainsend.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh
                                 PARENT_SCOPE)
-
+set(bin_files     ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py                        PARENT_SCOPE)
+set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.c                  PARENT_SCOPE)
 set(xml_files     ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/actor-create_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/actor-lifetime_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/actor-yield_d.xml
@@ -59,6 +72,7 @@ set(xml_files     ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/actor-cr
                                ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/async-waitall_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/async-waitany_d.xml
+                               ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/io-file-remote/io-file-remote_d.xml
                                ${CMAKE_CURRENT_SOURCE_DIR}/platform-properties/platform-properties_d.xml
                                PARENT_SCOPE)
@@ -90,3 +104,22 @@ ADD_TESH_FACTORIES(app-masterworker-vivaldi     "thread;ucontext;raw;boost"
                                                 --setenv bindir=${CMAKE_BINARY_DIR}/examples/c/app-masterworker
                                                 --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
                                                 ${CMAKE_HOME_DIRECTORY}/examples/c/app-masterworker/app-masterworker-vivaldi.tesh)
+ADD_TESH_FACTORIES(c-dht-kademlia "thread;ucontext;raw;boost" 
+                                  --setenv bindir=${CMAKE_BINARY_DIR}/examples/c/dht-kademlia
+                                  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/c/dht-kademlia 
+                                  --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
+                                  ${CMAKE_HOME_DIRECTORY}/examples/c/dht-kademlia/dht-kademlia.tesh)
+
+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()
+
+ADD_TESH_FACTORIES(c-dht-kademlia-parallel "${parallel-factories}" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO}
+                                           --setenv bindir=${CMAKE_BINARY_DIR}/examples/c/dht-kademlia
+                                           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/c/dht-kademlia
+                                           --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
+                                           ${CMAKE_HOME_DIRECTORY}/examples/c/dht-kademlia/dht-kademlia.tesh)