aboutsummaryrefslogtreecommitdiff
path: root/src/experimentation/test_experimentation_clique_connect.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-08-30 11:41:26 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-08-30 11:41:26 +0000
commit3df2832fdf4bd38c1c766fe1b3f2a97c9fe1fe4d (patch)
treeb34ba8ceabb3b0b709148daf634eb94e8123db4f /src/experimentation/test_experimentation_clique_connect.c
parent75bb2cabda18a4105f518fcebf7fe95dde3132d6 (diff)
downloadgnunet-3df2832fdf4bd38c1c766fe1b3f2a97c9fe1fe4d.tar.gz
gnunet-3df2832fdf4bd38c1c766fe1b3f2a97c9fe1fe4d.zip
updated experimentation tests
added scope time for feedback api
Diffstat (limited to 'src/experimentation/test_experimentation_clique_connect.c')
-rw-r--r--src/experimentation/test_experimentation_clique_connect.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/experimentation/test_experimentation_clique_connect.c b/src/experimentation/test_experimentation_clique_connect.c
index 9b4d0117b..1905035b3 100644
--- a/src/experimentation/test_experimentation_clique_connect.c
+++ b/src/experimentation/test_experimentation_clique_connect.c
@@ -94,7 +94,7 @@ struct ExperimentationPeer
94}; 94};
95 95
96 96
97struct ExperimentationPeer ph[NUM_PEERS]; 97struct ExperimentationPeer bp_slaves[NUM_PEERS];
98 98
99/** 99/**
100 * Shutdown nicely 100 * Shutdown nicely
@@ -110,9 +110,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
110 110
111 for (peer = 0; peer < NUM_PEERS; peer++) 111 for (peer = 0; peer < NUM_PEERS; peer++)
112 { 112 {
113 if (NULL != ph[peer].stat_op) 113 if (NULL != bp_slaves[peer].stat_op)
114 GNUNET_TESTBED_operation_done (ph[peer].stat_op); 114 GNUNET_TESTBED_operation_done (bp_slaves[peer].stat_op);
115 ph[peer].stat_op = NULL; 115 bp_slaves[peer].stat_op = NULL;
116 } 116 }
117 117
118 if (NULL != op) 118 if (NULL != op)
@@ -173,12 +173,12 @@ check_end ()
173 173
174 for (peer = 0; peer < NUM_PEERS; peer++) 174 for (peer = 0; peer < NUM_PEERS; peer++)
175 { 175 {
176 total_active += ph[peer].active_nodes; 176 total_active += bp_slaves[peer].active_nodes;
177 total_requested += ph[peer].requested_nodes; 177 total_requested += bp_slaves[peer].requested_nodes;
178 total_inactive += ph[peer].inactive_nodes; 178 total_inactive += bp_slaves[peer].inactive_nodes;
179 if (NUM_ISSUER == ph[peer].issuer) 179 if (NUM_ISSUER == bp_slaves[peer].issuer)
180 issuer ++; 180 issuer ++;
181 if (NUM_EXPERIMENTS == ph[peer].experiments) 181 if (NUM_EXPERIMENTS == bp_slaves[peer].experiments)
182 experiments ++; 182 experiments ++;
183 } 183 }
184 if ((last_issuer_value < issuer) && (issuer == NUM_PEERS)) 184 if ((last_issuer_value < issuer) && (issuer == NUM_PEERS))
@@ -367,12 +367,12 @@ test_master (void *cls, unsigned int num_peers,
367 { 367 {
368 GNUNET_assert (NULL != peers_[peer]); 368 GNUNET_assert (NULL != peers_[peer]);
369 /* Connect to peer's statistic service */ 369 /* Connect to peer's statistic service */
370 ph[peer].stat_op = GNUNET_TESTBED_service_connect (NULL, 370 bp_slaves[peer].stat_op = GNUNET_TESTBED_service_connect (NULL,
371 peers_[peer], "statistics", 371 peers_[peer], "statistics",
372 &stat_comp_cb, &ph[peer], 372 &stat_comp_cb, &bp_slaves[peer],
373 &stat_connect_adapter, 373 &stat_connect_adapter,
374 &stat_disconnect_adapter, 374 &stat_disconnect_adapter,
375 &ph[peer]); 375 &bp_slaves[peer]);
376 376
377 } 377 }
378 peers = peers_; 378 peers = peers_;