aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_group.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-06-14 09:37:21 +0000
committerNathan S. Evans <evans@in.tum.de>2010-06-14 09:37:21 +0000
commite5d0b4aadf77fb0a303320f9a6568a5d64cf8e00 (patch)
tree716c24011d21921c3efb3b89888e5c999cd4916c /src/testing/testing_group.c
parent5f04609b906a435465dc09ff31173aafb0353e9b (diff)
downloadgnunet-e5d0b4aadf77fb0a303320f9a6568a5d64cf8e00.tar.gz
gnunet-e5d0b4aadf77fb0a303320f9a6568a5d64cf8e00.zip
test case config files
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r--src/testing/testing_group.c19
1 files changed, 5 insertions, 14 deletions
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 }