diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-14 09:37:21 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-14 09:37:21 +0000 |
commit | e5d0b4aadf77fb0a303320f9a6568a5d64cf8e00 (patch) | |
tree | 716c24011d21921c3efb3b89888e5c999cd4916c /src/testing | |
parent | 5f04609b906a435465dc09ff31173aafb0353e9b (diff) | |
download | gnunet-e5d0b4aadf77fb0a303320f9a6568a5d64cf8e00.tar.gz gnunet-e5d0b4aadf77fb0a303320f9a6568a5d64cf8e00.zip |
test case config files
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_data_topology_clique_dfs.conf | 48 | ||||
-rw-r--r-- | src/testing/test_testing_data_topology_scale_free.conf | 46 | ||||
-rw-r--r-- | src/testing/test_testing_group_remote.c | 13 | ||||
-rw-r--r-- | src/testing/testing_group.c | 19 |
4 files changed, 111 insertions, 15 deletions
diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf new file mode 100644 index 000000000..fa4579b28 --- /dev/null +++ b/src/testing/test_testing_data_topology_clique_dfs.conf | |||
@@ -0,0 +1,48 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | ||
3 | DEFAULTCONFIG = test_testing_data_topology_clique.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 2564 | ||
7 | |||
8 | [transport] | ||
9 | PORT = 2565 | ||
10 | PLUGINS = tcp | ||
11 | #PREFIX = xterm -e xterm -T transport -e gdb --args | ||
12 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport | ||
13 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | ||
14 | #DEBUG = YES | ||
15 | |||
16 | [arm] | ||
17 | PORT = 2566 | ||
18 | DEFAULTSERVICES = peerinfo transport core | ||
19 | |||
20 | [statistics] | ||
21 | PORT = 2567 | ||
22 | |||
23 | [transport-tcp] | ||
24 | PORT = 2568 | ||
25 | |||
26 | [transport-udp] | ||
27 | PORT = 2568 | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 2569 | ||
31 | #DEBUG = YES | ||
32 | #PREFIX = xterm -e xterm -T peerinfo -e gdb --args | ||
33 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo | ||
34 | #PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p | ||
35 | |||
36 | [core] | ||
37 | PORT = 2570 | ||
38 | #PREFIX = xterm -e xterm -T CORE -e gdb --args | ||
39 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | ||
40 | #DEBUG = YES | ||
41 | |||
42 | [testing] | ||
43 | NUM_PEERS = 7 | ||
44 | WEAKRANDOM = YES | ||
45 | TOPOLOGY = 0 | ||
46 | CONNECT_TOPOLOGY_OPTION = 3 | ||
47 | CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 | ||
48 | F2F = YES | ||
diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf new file mode 100644 index 000000000..5cb3eddb4 --- /dev/null +++ b/src/testing/test_testing_data_topology_scale_free.conf | |||
@@ -0,0 +1,46 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | ||
3 | DEFAULTCONFIG = test_testing_data_topology_scale_free.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 2564 | ||
7 | |||
8 | [transport] | ||
9 | PORT = 2565 | ||
10 | PLUGINS = tcp | ||
11 | #PREFIX = xterm -e xterm -T transport -e gdb --args | ||
12 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport | ||
13 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | ||
14 | #DEBUG = YES | ||
15 | |||
16 | [arm] | ||
17 | PORT = 2566 | ||
18 | DEFAULTSERVICES = peerinfo transport core | ||
19 | |||
20 | [statistics] | ||
21 | PORT = 2567 | ||
22 | |||
23 | [transport-tcp] | ||
24 | PORT = 2568 | ||
25 | |||
26 | [transport-udp] | ||
27 | PORT = 2568 | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 2569 | ||
31 | #DEBUG = YES | ||
32 | #PREFIX = xterm -e xterm -T peerinfo -e gdb --args | ||
33 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo | ||
34 | #PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p | ||
35 | |||
36 | [core] | ||
37 | PORT = 2570 | ||
38 | #PREFIX = xterm -e xterm -T CORE -e gdb --args | ||
39 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | ||
40 | #DEBUG = YES | ||
41 | |||
42 | [testing] | ||
43 | NUM_PEERS = 500 | ||
44 | WEAKRANDOM = YES | ||
45 | TOPOLOGY = 7 | ||
46 | F2F = YES | ||
diff --git a/src/testing/test_testing_group_remote.c b/src/testing/test_testing_group_remote.c index 6bcdb475d..f2ad8f3d3 100644 --- a/src/testing/test_testing_group_remote.c +++ b/src/testing/test_testing_group_remote.c | |||
@@ -40,6 +40,8 @@ static int ok; | |||
40 | 40 | ||
41 | static int peers_left; | 41 | static int peers_left; |
42 | 42 | ||
43 | static int peers_failed; | ||
44 | |||
43 | static struct GNUNET_TESTING_PeerGroup *pg; | 45 | static struct GNUNET_TESTING_PeerGroup *pg; |
44 | 46 | ||
45 | static struct GNUNET_SCHEDULER_Handle *sched; | 47 | static struct GNUNET_SCHEDULER_Handle *sched; |
@@ -55,13 +57,22 @@ my_cb (void *cls, | |||
55 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 57 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
56 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | 58 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
57 | { | 59 | { |
58 | GNUNET_assert (id != NULL); | 60 | if (emsg != NULL) |
61 | { | ||
62 | peers_failed++; | ||
63 | } | ||
64 | |||
59 | peers_left--; | 65 | peers_left--; |
60 | if (peers_left == 0) | 66 | if (peers_left == 0) |
61 | { | 67 | { |
62 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); | 68 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
63 | ok = 0; | 69 | ok = 0; |
64 | } | 70 | } |
71 | else if (failed_peers == peers_left) | ||
72 | { | ||
73 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n"); | ||
74 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); | ||
75 | } | ||
65 | } | 76 | } |
66 | 77 | ||
67 | 78 | ||
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 38fbe542b..2f8db6a81 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2209,9 +2209,9 @@ choose_minimum(struct GNUNET_TESTING_PeerGroup *pg, unsigned int num) | |||
2209 | uint32_t pg_iter; | 2209 | uint32_t pg_iter; |
2210 | 2210 | ||
2211 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) | 2211 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) |
2212 | { | 2212 | { |
2213 | pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num); | 2213 | pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num); |
2214 | } | 2214 | } |
2215 | 2215 | ||
2216 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) | 2216 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) |
2217 | { | 2217 | { |
@@ -2222,7 +2222,6 @@ choose_minimum(struct GNUNET_TESTING_PeerGroup *pg, unsigned int num) | |||
2222 | minimum_ctx.pg = pg; | 2222 | minimum_ctx.pg = pg; |
2223 | minimum_ctx.num_to_add = num; | 2223 | minimum_ctx.num_to_add = num; |
2224 | minimum_ctx.current = 0; | 2224 | minimum_ctx.current = 0; |
2225 | pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(pg->total); | ||
2226 | GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers, | 2225 | GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers, |
2227 | &minimum_connect_iterator, | 2226 | &minimum_connect_iterator, |
2228 | &minimum_ctx); | 2227 | &minimum_ctx); |
@@ -2234,9 +2233,6 @@ choose_minimum(struct GNUNET_TESTING_PeerGroup *pg, unsigned int num) | |||
2234 | GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers); | 2233 | GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers); |
2235 | /* And replace with the working set */ | 2234 | /* And replace with the working set */ |
2236 | pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set; | 2235 | pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set; |
2237 | fprintf(stderr, | ||
2238 | "Finished! Hashmap size %u\n", | ||
2239 | GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers)); | ||
2240 | } | 2236 | } |
2241 | 2237 | ||
2242 | } | 2238 | } |
@@ -2336,18 +2332,11 @@ perform_dfs (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num) | |||
2336 | 2332 | ||
2337 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) | 2333 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) |
2338 | { | 2334 | { |
2339 | |||
2340 | } | ||
2341 | |||
2342 | for (pg_iter = 0; pg_iter < pg->total; pg_iter++) | ||
2343 | { | ||
2344 | /* Remove the "old" connections */ | 2335 | /* Remove the "old" connections */ |
2345 | GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers); | 2336 | GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers); |
2346 | /* And replace with the working set */ | 2337 | /* And replace with the working set */ |
2347 | pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set; | 2338 | pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set; |
2348 | fprintf(stderr, "Finished! Hashmap size %u\n", GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers)); | ||
2349 | } | 2339 | } |
2350 | |||
2351 | } | 2340 | } |
2352 | 2341 | ||
2353 | /** | 2342 | /** |
@@ -2872,10 +2861,12 @@ GNUNET_TESTING_daemons_churn (struct GNUNET_TESTING_PeerGroup *pg, | |||
2872 | { | 2861 | { |
2873 | if (pg->peers[i].daemon->running == GNUNET_YES) | 2862 | if (pg->peers[i].daemon->running == GNUNET_YES) |
2874 | { | 2863 | { |
2864 | GNUNET_assert(running != -1); | ||
2875 | running++; | 2865 | running++; |
2876 | } | 2866 | } |
2877 | else | 2867 | else |
2878 | { | 2868 | { |
2869 | GNUNET_assert(stopped != -1); | ||
2879 | stopped++; | 2870 | stopped++; |
2880 | } | 2871 | } |
2881 | } | 2872 | } |