aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_testbed_run.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-12-11 13:48:13 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-12-11 13:48:13 +0000
commit4ab00798bd41084fea7dd1361c5ebfe5771e315b (patch)
treef1faf214501b6c0b2b26aea8d1c2046f862dfa6a /src/testbed/test_testbed_api_testbed_run.c
parent19a850a8d8723fb70ce265304590d390f6782557 (diff)
downloadgnunet-4ab00798bd41084fea7dd1361c5ebfe5771e315b.tar.gz
gnunet-4ab00798bd41084fea7dd1361c5ebfe5771e315b.zip
fix 2689
Diffstat (limited to 'src/testbed/test_testbed_api_testbed_run.c')
-rw-r--r--src/testbed/test_testbed_api_testbed_run.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index 349dc4923..d41e33772 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -90,13 +90,14 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
90 90
91 91
92/** 92/**
93 * Task to be executed when peers are ready 93 * Signature of a main function for a testcase.
94 * 94 *
95 * @param cls NULL 95 * @param cls closure
96 * @param tc the task context 96 * @param num_peers number of peers in 'peers'
97 * @param peers handle to peers run in the testbed
97 */ 98 */
98static void 99static void
99master_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 100test_master (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers_)
100{ 101{
101 result = GNUNET_OK; 102 result = GNUNET_OK;
102 GNUNET_assert (NULL != peers[0]); 103 GNUNET_assert (NULL != peers[0]);
@@ -153,7 +154,7 @@ run (void *cls, char *const *args, const char *cfgfile,
153 event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); 154 event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
154 event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); 155 event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
155 GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb, 156 GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
156 NULL, &master_task, NULL); 157 NULL, &test_master, NULL);
157 abort_task = 158 abort_task =
158 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 159 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
159 (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort, 160 (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,