From 804984d2554e37c85236d342355a266945c4fd9a Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 29 Mar 2016 11:35:37 +0200 Subject: [PATCH] factoring --- .gitignore | 2 +- examples/msg/CMakeLists.txt | 59 +++++++++++++------ examples/msg/bittorrent/CMakeLists.txt | 19 ------ examples/msg/bittorrent/bittorrent.tesh | 2 +- .../{bittorrent.xml => bittorrent_d.xml} | 0 examples/msg/chainsend/CMakeLists.txt | 18 ------ examples/msg/chainsend/chainsend.tesh | 2 +- examples/msg/chainsend/chainsend_d.xml | 20 +++++++ examples/msg/chainsend/deployment_tesh.xml | 37 ------------ examples/msg/dht-kademlia/CMakeLists.txt | 14 ----- .../{kademlia.c => dht-kademlia.c} | 2 +- .../{kademlia.h => dht-kademlia.h} | 0 .../{kademlia.tesh => dht-kademlia.tesh} | 2 +- .../{kademlia.xml => dht-kademlia_d.xml} | 0 tools/cmake/DefinePackages.cmake | 3 - 15 files changed, 67 insertions(+), 113 deletions(-) delete mode 100644 examples/msg/bittorrent/CMakeLists.txt rename examples/msg/bittorrent/{bittorrent.xml => bittorrent_d.xml} (100%) delete mode 100644 examples/msg/chainsend/CMakeLists.txt create mode 100644 examples/msg/chainsend/chainsend_d.xml delete mode 100644 examples/msg/chainsend/deployment_tesh.xml delete mode 100644 examples/msg/dht-kademlia/CMakeLists.txt rename examples/msg/dht-kademlia/{kademlia.c => dht-kademlia.c} (99%) rename examples/msg/dht-kademlia/{kademlia.h => dht-kademlia.h} (100%) rename examples/msg/dht-kademlia/{kademlia.tesh => dht-kademlia.tesh} (93%) rename examples/msg/dht-kademlia/{kademlia.xml => dht-kademlia_d.xml} (100%) diff --git a/.gitignore b/.gitignore index 32bf829587..97e699b71c 100644 --- a/.gitignore +++ b/.gitignore @@ -133,7 +133,7 @@ examples/msg/cloud/scale examples/msg/cloud/simple_vm examples/msg/cloud/two_tasks_vm examples/msg/dht-chord/dht-chord -examples/msg/dht-kademlia/kademlia +examples/msg/dht-kademlia/dht-kademlia examples/msg/dht-pastry/dht-pastry examples/msg/energy-consumption/energy-consumption examples/msg/energy-onoff/energy-onoff diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index 001f995c7c..2148bca0f2 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -16,28 +16,55 @@ if(HAVE_NS3) set_target_properties(ns3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ns3) endif() +add_executable (bittorrent bittorrent/bittorrent.c bittorrent/messages.c bittorrent/peer.c bittorrent/tracker.c bittorrent/connection.c) +target_link_libraries(bittorrent simgrid) +set_target_properties(bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bittorrent) +foreach (file bittorrent connection messages peer tracker) + set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/${file}.h) +endforeach() + +add_executable (chainsend chainsend/chainsend.c chainsend/iterator.c chainsend/common.c chainsend/messages.c chainsend/broadcaster.c chainsend/peer.c) +target_link_libraries(chainsend simgrid) +set_target_properties(chainsend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/chainsend) +foreach (file common iterator messages broadcaster peer) + set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/${file}.h) +endforeach() + +add_executable (dht-kademlia dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/task.c dht-kademlia/answer.c) +target_link_libraries(dht-kademlia simgrid) +set_target_properties(dht-kademlia PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-kademlia) +foreach (file answer dht-kademlia node routing_table task) + set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/${file}.h) +endforeach() + +foreach (file actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-kademlia + io-remote priority properties sendrecv set-maestro) + set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}/${file}_d.xml) +endforeach() + set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/README ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi.txt ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p0.txt ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p1.txt ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage.txt PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.c PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait_d.xml +set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/generate.py + ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py + ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py PARENT_SCOPE) +set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/chainsend.c + ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h + ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.c PARENT_SCOPE) +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/bittorrent.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/chainsend/chainsend.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh PARENT_SCOPE) +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait2_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml ${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-chord/chord.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord10.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-pastry/pastry10.xml ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml - ${CMAKE_CURRENT_SOURCE_DIR}/io-remote/io-remote_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3hosts_2links_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml @@ -46,18 +73,14 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action ${CMAKE_CURRENT_SOURCE_DIR}/ns3/onelink_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/one_cluster_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/ns3/two_clusters_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv/sendrecv_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro/set-maestro_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/baseline_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/kill_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time/start_kill_d.xml PARENT_SCOPE) -foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord failures io-file io-file-unlink - io-remote io-storage priority process-kill process-migration process-suspend properties sendrecv synchro - start_kill_time token_ring) +foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany bittorrent chainsend dht-chord dht-kademlia + failures io-file io-file-unlink io-remote io-storage priority process-kill process-migration process-suspend + properties sendrecv synchro start_kill_time token_ring) ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh) endforeach() @@ -69,7 +92,9 @@ foreach (x categories link-srcdst-user-variables link-user-variables masterslave ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh) endforeach() +ADD_TESH_FACTORIES(msg-bittorrent-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/bittorrent --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent bittorrent.tesh) ADD_TESH_FACTORIES(msg-dht-chord-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh) +ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia dht-kademlia.tesh) ADD_TESH_FACTORIES(msg-energy-pstate-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh) ADD_TESH_FACTORIES(msg-energy-consumption-ptask "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh) ADD_TESH_FACTORIES(msg-energy-ptask "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh) diff --git a/examples/msg/bittorrent/CMakeLists.txt b/examples/msg/bittorrent/CMakeLists.txt deleted file mode 100644 index c5a52bce81..0000000000 --- a/examples/msg/bittorrent/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_executable (bittorrent bittorrent.c messages.c peer.c tracker.c connection.c) -target_link_libraries(bittorrent simgrid) - -ADD_TESH_FACTORIES(msg-bittorrent "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/bittorrent --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent bittorrent.tesh) -ADD_TESH_FACTORIES(msg-bittorrent-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/bittorrent --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent bittorrent.tesh) - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.xml PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/generate.py PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.c - ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent.h - ${CMAKE_CURRENT_SOURCE_DIR}/connection.c - ${CMAKE_CURRENT_SOURCE_DIR}/connection.h - ${CMAKE_CURRENT_SOURCE_DIR}/messages.c - ${CMAKE_CURRENT_SOURCE_DIR}/messages.h - ${CMAKE_CURRENT_SOURCE_DIR}/peer.c - ${CMAKE_CURRENT_SOURCE_DIR}/peer.h - ${CMAKE_CURRENT_SOURCE_DIR}/tracker.c - ${CMAKE_CURRENT_SOURCE_DIR}/tracker.h PARENT_SCOPE) diff --git a/examples/msg/bittorrent/bittorrent.tesh b/examples/msg/bittorrent/bittorrent.tesh index fbe1fc223f..956f4a30f4 100755 --- a/examples/msg/bittorrent/bittorrent.tesh +++ b/examples/msg/bittorrent/bittorrent.tesh @@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with MSG ! timeout 10 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/bittorrent ${srcdir:=.}/../../platforms/cluster.xml ${srcdir:=.}/bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/bittorrent ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/bittorrent/bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:tracker@node-0.acme.org) Tracker launched. > [ 0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2 > [ 0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3 diff --git a/examples/msg/bittorrent/bittorrent.xml b/examples/msg/bittorrent/bittorrent_d.xml similarity index 100% rename from examples/msg/bittorrent/bittorrent.xml rename to examples/msg/bittorrent/bittorrent_d.xml diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt deleted file mode 100644 index 799cb997b5..0000000000 --- a/examples/msg/chainsend/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_executable (chainsend chainsend.c iterator.c common.c messages.c broadcaster.c peer.c) -target_link_libraries(chainsend simgrid) - -ADD_TESH(msg-chainsend --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chainsend --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend/chainsend.tesh) - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/chainsend.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment_tesh.xml PARENT_SCOPE) -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/iterator.h - ${CMAKE_CURRENT_SOURCE_DIR}/iterator.c - ${CMAKE_CURRENT_SOURCE_DIR}/common.h - ${CMAKE_CURRENT_SOURCE_DIR}/common.c - ${CMAKE_CURRENT_SOURCE_DIR}/messages.h - ${CMAKE_CURRENT_SOURCE_DIR}/messages.c - ${CMAKE_CURRENT_SOURCE_DIR}/broadcaster.h - ${CMAKE_CURRENT_SOURCE_DIR}/broadcaster.c - ${CMAKE_CURRENT_SOURCE_DIR}/peer.h - ${CMAKE_CURRENT_SOURCE_DIR}/peer.c - ${CMAKE_CURRENT_SOURCE_DIR}/chainsend.c PARENT_SCOPE) diff --git a/examples/msg/chainsend/chainsend.tesh b/examples/msg/chainsend/chainsend.tesh index dd74f2227d..2b3436b25f 100644 --- a/examples/msg/chainsend/chainsend.tesh +++ b/examples/msg/chainsend/chainsend.tesh @@ -4,7 +4,7 @@ p Testing the chainsend MSG implementation ! timeout 60 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chainsend ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deployment_tesh.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/chainsend ${srcdir:=.}/platform.xml ${srcdir:=.}/../msg/chainsend/chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" > [ 587.704210] (2:peer@Boivin) ### 587.704224 16777216 bytes (Avg 0.027225 MB/s); copy finished (simulated). > [ 786.931829] (3:peer@Jean_Yves) ### 786.931824 16777216 bytes (Avg 0.020332 MB/s); copy finished (simulated). > [ 788.837385] (4:peer@TeX) ### 788.837402 16777216 bytes (Avg 0.020283 MB/s); copy finished (simulated). diff --git a/examples/msg/chainsend/chainsend_d.xml b/examples/msg/chainsend/chainsend_d.xml new file mode 100644 index 0000000000..c4f0ce74a6 --- /dev/null +++ b/examples/msg/chainsend/chainsend_d.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/chainsend/deployment_tesh.xml b/examples/msg/chainsend/deployment_tesh.xml deleted file mode 100644 index 2fd403835a..0000000000 --- a/examples/msg/chainsend/deployment_tesh.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/msg/dht-kademlia/CMakeLists.txt b/examples/msg/dht-kademlia/CMakeLists.txt deleted file mode 100644 index 063c8fab7e..0000000000 --- a/examples/msg/dht-kademlia/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -add_executable (kademlia kademlia.c node.c routing_table.c task.c answer.c) -target_link_libraries(kademlia simgrid) - -ADD_TESH_FACTORIES(msg-dht-kademlia "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia kademlia.tesh) -ADD_TESH(msg-dht-kademlia-parallel --cfg contexts/nthreads:4 --cfg contexts/factory:thread ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia kademlia.tesh) - -foreach (file answer kademlia node routing_table task) - set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c ${CMAKE_CURRENT_SOURCE_DIR}/${file}.h) -endforeach() - -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/common.h PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.xml PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/generate.py PARENT_SCOPE) diff --git a/examples/msg/dht-kademlia/kademlia.c b/examples/msg/dht-kademlia/dht-kademlia.c similarity index 99% rename from examples/msg/dht-kademlia/kademlia.c rename to examples/msg/dht-kademlia/dht-kademlia.c index 6eae1ee293..1177377716 100644 --- a/examples/msg/dht-kademlia/kademlia.c +++ b/examples/msg/dht-kademlia/dht-kademlia.c @@ -4,7 +4,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "kademlia.h" +#include "dht-kademlia.h" #include "node.h" #include "task.h" diff --git a/examples/msg/dht-kademlia/kademlia.h b/examples/msg/dht-kademlia/dht-kademlia.h similarity index 100% rename from examples/msg/dht-kademlia/kademlia.h rename to examples/msg/dht-kademlia/dht-kademlia.h diff --git a/examples/msg/dht-kademlia/kademlia.tesh b/examples/msg/dht-kademlia/dht-kademlia.tesh similarity index 93% rename from examples/msg/dht-kademlia/kademlia.tesh rename to examples/msg/dht-kademlia/dht-kademlia.tesh index ef3212a577..22ecfa195c 100644 --- a/examples/msg/dht-kademlia/kademlia.tesh +++ b/examples/msg/dht-kademlia/dht-kademlia.tesh @@ -3,7 +3,7 @@ p Testing the Kademlia implementation with MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/kademlia ${srcdir:=.}/../../platforms/cluster.xml ${srcdir:=.}/kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/dht-kademlia ${srcdir:=.}/cluster.xml ${srcdir:=.}/../msg/dht-kademlia/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" > [ 0.000000] ( 1:node@node-0.acme.org) Hi, I'm going to create the network with id 00000000 > [ 0.000000] ( 2:node@node-1.acme.org) Hi, I'm going to join the network with id 00000001 > [ 0.000000] ( 3:node@node-2.acme.org) Hi, I'm going to join the network with id 00000003 diff --git a/examples/msg/dht-kademlia/kademlia.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml similarity index 100% rename from examples/msg/dht-kademlia/kademlia.xml rename to examples/msg/dht-kademlia/dht-kademlia_d.xml diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 92d03a7914..0c3838d7f2 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -944,10 +944,7 @@ set(CMAKEFILES_TXT examples/java/tracing/CMakeLists.txt examples/msg/CMakeLists.txt - examples/msg/bittorrent/CMakeLists.txt - examples/msg/chainsend/CMakeLists.txt examples/msg/cloud/CMakeLists.txt - examples/msg/dht-kademlia/CMakeLists.txt examples/msg/masterslave/CMakeLists.txt examples/msg/mc/CMakeLists.txt examples/s4u/CMakeLists.txt -- 2.20.1