From: Frederic Suter Date: Wed, 23 Mar 2016 11:15:08 +0000 (+0100) Subject: all DHT examples are now called dht- X-Git-Tag: v3_13~329 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/417742f1c7f6545db82079acd702fde03547d400 all DHT examples are now called dht- --- diff --git a/.gitignore b/.gitignore index 7e3c0adde0..00b7c7d041 100644 --- a/.gitignore +++ b/.gitignore @@ -123,10 +123,7 @@ examples/msg/bittorrent/bittorrent examples/msg/bittorrent/bittorrent_platfgen examples/msg/categories.trace examples/msg/chainsend/chainsend -examples/msg/chord/chord -examples/msg/chord/chord_stateful -examples/msg/chord/deployments -examples/msg/chord/exp_* +examples/msg/dht-chord/dht-chord examples/msg/cloud/bound examples/msg/cloud/master_worker_vm examples/msg/cloud/migrate_vm @@ -151,7 +148,7 @@ examples/msg/io/remote examples/msg/io/storage examples/msg/irc_isend/peer examples/msg/irc_isend/toto.txt -examples/msg/kademlia/kademlia +examples/msg/dht-kademlia/kademlia examples/msg/masterslave/masterslave_arg examples/msg/masterslave/masterslave_cluster examples/msg/masterslave/masterslave_failure @@ -180,7 +177,7 @@ examples/msg/ns3/ns3 examples/msg/parallel_contexts/pcontexts examples/msg/parallel_contexts/pcontexts2 examples/msg/parallel_task/parallel_task -examples/msg/pastry/pastry +examples/msg/dht-pastry/pastry examples/msg/pmm/pmm examples/msg/priority/priority examples/msg/procmig.trace diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt index 9feaf4b554..a76e30bd6d 100644 --- a/examples/msg/CMakeLists.txt +++ b/examples/msg/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach(x chord exception migration parallel_task pmm priority properties suspend synchro token_ring) +foreach(x dht-chord exception migration parallel_task pmm priority properties suspend synchro token_ring) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -11,22 +11,22 @@ foreach(file bourassa fafard ginette jupiter link3 link4 link5) endforeach() set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/README PARENT_SCOPE) -set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/chord/generate.py PARENT_SCOPE) +set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py PARENT_SCOPE) set(examples_src ${examples_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_crosstraffic.tesh +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task/parallel_task_energy.tesh PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord.xml - ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord10.xml +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord.xml + ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord10.xml ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml PARENT_SCOPE) -foreach(x chord migration priority properties suspend synchro token_ring) +foreach(x dht-chord migration priority properties suspend synchro 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() -ADD_TESH_FACTORIES(msg-chord-crosstraffic "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh) -ADD_TESH_FACTORIES(msg-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh) -ADD_TESH_FACTORIES(msg-chord-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh) +ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh) +ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.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-ptask "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh) ADD_TESH_FACTORIES(msg-ptask-energy "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task_energy.tesh) diff --git a/examples/msg/chord/chord.xml b/examples/msg/dht-chord/chord.xml similarity index 100% rename from examples/msg/chord/chord.xml rename to examples/msg/dht-chord/chord.xml diff --git a/examples/msg/chord/chord10.xml b/examples/msg/dht-chord/chord10.xml similarity index 100% rename from examples/msg/chord/chord10.xml rename to examples/msg/dht-chord/chord10.xml diff --git a/examples/msg/chord/chord.c b/examples/msg/dht-chord/dht-chord.c similarity index 100% rename from examples/msg/chord/chord.c rename to examples/msg/dht-chord/dht-chord.c diff --git a/examples/msg/chord/chord.tesh b/examples/msg/dht-chord/dht-chord.tesh similarity index 99% rename from examples/msg/chord/chord.tesh rename to examples/msg/dht-chord/dht-chord.tesh index ea3c5cc3b2..c568c9d00c 100644 --- a/examples/msg/chord/chord.tesh +++ b/examples/msg/dht-chord/dht-chord.tesh @@ -3,7 +3,7 @@ p Testing the Chord implementation with MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/platform.xml ${srcdir:=.}/../msg/chord/chord.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/dht-chord$EXEEXT -nb_bits=6 ${srcdir:=.}/platform.xml ${srcdir:=.}/../msg/dht-chord/chord.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (1:node@Gatien) Joining the ring with id 48, knowing node 1 > [ 0.000000] (2:node@McGee) Joining the ring with id 42, knowing node 1 @@ -457,7 +457,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/platform.xml > [804.364963] (0:maestro@) Simulated time: 804.365 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/routing_none.xml ${srcdir:=.}/../msg/chord/chord10.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant +$ $SG_TEST_EXENV ${bindir:=.}/dht-chord$EXEEXT ${srcdir:=.}/routing_none.xml ${srcdir:=.}/../msg/dht-chord/chord10.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant > [ 0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:node@node-0.acme.org) My finger table: diff --git a/examples/msg/chord/chord_crosstraffic.tesh b/examples/msg/dht-chord/dht-chord_crosstraffic.tesh similarity index 99% rename from examples/msg/chord/chord_crosstraffic.tesh rename to examples/msg/dht-chord/dht-chord_crosstraffic.tesh index 209bb5d2aa..217a9e03f3 100644 --- a/examples/msg/chord/chord_crosstraffic.tesh +++ b/examples/msg/dht-chord/dht-chord_crosstraffic.tesh @@ -3,7 +3,7 @@ p> Testing the Chord implementation with MSG ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ $SG_TEST_EXENV ${bindir:=.}/dht-chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:node@Gatien) Joining the ring with id 48, knowing node 1 > [ 0.000000] (2:node@McGee) Joining the ring with id 42, knowing node 1 > [ 0.000000] (3:node@iRMX) Joining the ring with id 38, knowing node 1 @@ -456,7 +456,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../../platfor > [804.365058] (0:maestro@) Simulated time: 804.365 ! output sort 19 -$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/routing_none.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant +$ $SG_TEST_EXENV ${bindir:=.}/dht-chord$EXEEXT ${srcdir:=.}/../../platforms/routing_none.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant > [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'Constant' > [ 0.000000] (1:node@node-0.acme.org) My finger table: > [ 0.000000] (1:node@node-0.acme.org) Start | Succ diff --git a/examples/msg/chord/generate.py b/examples/msg/dht-chord/generate.py similarity index 100% rename from examples/msg/chord/generate.py rename to examples/msg/dht-chord/generate.py diff --git a/examples/msg/kademlia/CMakeLists.txt b/examples/msg/dht-kademlia/CMakeLists.txt similarity index 60% rename from examples/msg/kademlia/CMakeLists.txt rename to examples/msg/dht-kademlia/CMakeLists.txt index ffaf5a8547..063c8fab7e 100644 --- a/examples/msg/kademlia/CMakeLists.txt +++ b/examples/msg/dht-kademlia/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable (kademlia kademlia.c node.c routing_table.c task.c answer.c) target_link_libraries(kademlia simgrid) -ADD_TESH_FACTORIES(msg-kademlia "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) -ADD_TESH(msg-kademlia-parallel --cfg contexts/nthreads:4 --cfg contexts/factory:thread ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/kademlia --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia kademlia.tesh) +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) diff --git a/examples/msg/kademlia/answer.c b/examples/msg/dht-kademlia/answer.c similarity index 100% rename from examples/msg/kademlia/answer.c rename to examples/msg/dht-kademlia/answer.c diff --git a/examples/msg/kademlia/answer.h b/examples/msg/dht-kademlia/answer.h similarity index 100% rename from examples/msg/kademlia/answer.h rename to examples/msg/dht-kademlia/answer.h diff --git a/examples/msg/kademlia/common.h b/examples/msg/dht-kademlia/common.h similarity index 100% rename from examples/msg/kademlia/common.h rename to examples/msg/dht-kademlia/common.h diff --git a/examples/msg/kademlia/generate.py b/examples/msg/dht-kademlia/generate.py similarity index 100% rename from examples/msg/kademlia/generate.py rename to examples/msg/dht-kademlia/generate.py diff --git a/examples/msg/kademlia/kademlia.c b/examples/msg/dht-kademlia/kademlia.c similarity index 100% rename from examples/msg/kademlia/kademlia.c rename to examples/msg/dht-kademlia/kademlia.c diff --git a/examples/msg/kademlia/kademlia.h b/examples/msg/dht-kademlia/kademlia.h similarity index 100% rename from examples/msg/kademlia/kademlia.h rename to examples/msg/dht-kademlia/kademlia.h diff --git a/examples/msg/kademlia/kademlia.tesh b/examples/msg/dht-kademlia/kademlia.tesh similarity index 100% rename from examples/msg/kademlia/kademlia.tesh rename to examples/msg/dht-kademlia/kademlia.tesh diff --git a/examples/msg/kademlia/kademlia.xml b/examples/msg/dht-kademlia/kademlia.xml similarity index 100% rename from examples/msg/kademlia/kademlia.xml rename to examples/msg/dht-kademlia/kademlia.xml diff --git a/examples/msg/kademlia/node.c b/examples/msg/dht-kademlia/node.c similarity index 100% rename from examples/msg/kademlia/node.c rename to examples/msg/dht-kademlia/node.c diff --git a/examples/msg/kademlia/node.h b/examples/msg/dht-kademlia/node.h similarity index 100% rename from examples/msg/kademlia/node.h rename to examples/msg/dht-kademlia/node.h diff --git a/examples/msg/kademlia/routing_table.c b/examples/msg/dht-kademlia/routing_table.c similarity index 100% rename from examples/msg/kademlia/routing_table.c rename to examples/msg/dht-kademlia/routing_table.c diff --git a/examples/msg/kademlia/routing_table.h b/examples/msg/dht-kademlia/routing_table.h similarity index 100% rename from examples/msg/kademlia/routing_table.h rename to examples/msg/dht-kademlia/routing_table.h diff --git a/examples/msg/kademlia/task.c b/examples/msg/dht-kademlia/task.c similarity index 100% rename from examples/msg/kademlia/task.c rename to examples/msg/dht-kademlia/task.c diff --git a/examples/msg/kademlia/task.h b/examples/msg/dht-kademlia/task.h similarity index 100% rename from examples/msg/kademlia/task.h rename to examples/msg/dht-kademlia/task.h diff --git a/examples/msg/pastry/CMakeLists.txt b/examples/msg/dht-pastry/CMakeLists.txt similarity index 61% rename from examples/msg/pastry/CMakeLists.txt rename to examples/msg/dht-pastry/CMakeLists.txt index 5c6db6abb8..e0194d18f2 100644 --- a/examples/msg/pastry/CMakeLists.txt +++ b/examples/msg/dht-pastry/CMakeLists.txt @@ -1,7 +1,7 @@ add_executable (pastry pastry.c) target_link_libraries(pastry simgrid) -# ADD_TESH_FACTORIES(msg-pastry "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/pastry ${CMAKE_HOME_DIRECTORY}/examples/msg/pastry/pastry.tesh) +# ADD_TESH_FACTORIES(msg-dht-pastry "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry pastry.tesh) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/pastry.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/pastry10.xml PARENT_SCOPE) diff --git a/examples/msg/pastry/pastry.c b/examples/msg/dht-pastry/pastry.c similarity index 100% rename from examples/msg/pastry/pastry.c rename to examples/msg/dht-pastry/pastry.c diff --git a/examples/msg/pastry/pastry.tesh b/examples/msg/dht-pastry/pastry.tesh similarity index 100% rename from examples/msg/pastry/pastry.tesh rename to examples/msg/dht-pastry/pastry.tesh diff --git a/examples/msg/pastry/pastry10.xml b/examples/msg/dht-pastry/pastry10.xml similarity index 100% rename from examples/msg/pastry/pastry10.xml rename to examples/msg/dht-pastry/pastry10.xml diff --git a/examples/msg/ns3/dogbone-d.xml b/examples/msg/ns3/dogbone-d.xml index 0b495258f9..0fd2359c25 100644 --- a/examples/msg/ns3/dogbone-d.xml +++ b/examples/msg/ns3/dogbone-d.xml @@ -1,19 +1,16 @@ - - - diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/ns3/ns3.tesh index d6da7fe259..c2bf59357c 100644 --- a/examples/msg/ns3/ns3.tesh +++ b/examples/msg/ns3/ns3.tesh @@ -1,7 +1,7 @@ #! ./tesh p In the NS3 tests, the timings are not shown because the exact values may vary with your NS3 version. -p We just want to check that the NS3 bindings of SimGrid are working correctly, we don't want to throughoutly test NS3. +p We just want to check that the NS3 bindings of SimGrid are working correctly, we don't want to thoroughly test NS3. p 3hosts 2links diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index edc715f38d..e61786de28 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -947,15 +947,15 @@ set(CMAKEFILES_TXT examples/msg/bittorrent/CMakeLists.txt examples/msg/chainsend/CMakeLists.txt examples/msg/cloud/CMakeLists.txt + examples/msg/dht-kademlia/CMakeLists.txt + examples/msg/dht-pastry/CMakeLists.txt examples/msg/energy/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt examples/msg/io/CMakeLists.txt - examples/msg/kademlia/CMakeLists.txt examples/msg/masterslave/CMakeLists.txt examples/msg/mc/CMakeLists.txt examples/msg/ns3/CMakeLists.txt - examples/msg/pastry/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt examples/msg/set-maestro/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt