diff options
Diffstat (limited to 'src/testbed/test_testbed_api_topology_clique.c')
-rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 866ec83c5..33569a2b9 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -46,7 +46,7 @@ static struct GNUNET_TESTBED_Operation *op; | |||
46 | /** | 46 | /** |
47 | * Shutdown task | 47 | * Shutdown task |
48 | */ | 48 | */ |
49 | static struct GNUNET_SCHEDULER_Task * shutdown_task; | 49 | static struct GNUNET_SCHEDULER_Task *shutdown_task; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Testing result | 52 | * Testing result |
@@ -65,15 +65,15 @@ static unsigned int overlay_connects; | |||
65 | * @param cls NULL | 65 | * @param cls NULL |
66 | */ | 66 | */ |
67 | static void | 67 | static void |
68 | do_shutdown(void *cls) | 68 | do_shutdown (void *cls) |
69 | { | 69 | { |
70 | shutdown_task = NULL; | 70 | shutdown_task = NULL; |
71 | if (NULL != op) | 71 | if (NULL != op) |
72 | { | 72 | { |
73 | GNUNET_TESTBED_operation_done(op); | 73 | GNUNET_TESTBED_operation_done (op); |
74 | op = NULL; | 74 | op = NULL; |
75 | } | 75 | } |
76 | GNUNET_SCHEDULER_shutdown(); | 76 | GNUNET_SCHEDULER_shutdown (); |
77 | } | 77 | } |
78 | 78 | ||
79 | /** | 79 | /** |
@@ -83,31 +83,31 @@ do_shutdown(void *cls) | |||
83 | * @param event the controller event | 83 | * @param event the controller event |
84 | */ | 84 | */ |
85 | static void | 85 | static void |
86 | controller_event_cb(void *cls, | 86 | controller_event_cb (void *cls, |
87 | const struct GNUNET_TESTBED_EventInformation *event) | 87 | const struct GNUNET_TESTBED_EventInformation *event) |
88 | { | 88 | { |
89 | switch (event->type) | 89 | switch (event->type) |
90 | { | ||
91 | case GNUNET_TESTBED_ET_CONNECT: | ||
92 | overlay_connects++; | ||
93 | if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects) | ||
90 | { | 94 | { |
91 | case GNUNET_TESTBED_ET_CONNECT: | 95 | result = GNUNET_OK; |
92 | overlay_connects++; | 96 | GNUNET_SCHEDULER_cancel (shutdown_task); |
93 | if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects) | 97 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
94 | { | ||
95 | result = GNUNET_OK; | ||
96 | GNUNET_SCHEDULER_cancel(shutdown_task); | ||
97 | shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); | ||
98 | } | ||
99 | break; | ||
100 | |||
101 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: | ||
102 | GNUNET_assert(NULL != event->details.operation_finished.emsg); | ||
103 | break; | ||
104 | |||
105 | default: | ||
106 | GNUNET_break(0); | ||
107 | result = GNUNET_SYSERR; | ||
108 | GNUNET_SCHEDULER_cancel(shutdown_task); | ||
109 | shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); | ||
110 | } | 98 | } |
99 | break; | ||
100 | |||
101 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: | ||
102 | GNUNET_assert (NULL != event->details.operation_finished.emsg); | ||
103 | break; | ||
104 | |||
105 | default: | ||
106 | GNUNET_break (0); | ||
107 | result = GNUNET_SYSERR; | ||
108 | GNUNET_SCHEDULER_cancel (shutdown_task); | ||
109 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
110 | } | ||
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
@@ -124,38 +124,38 @@ controller_event_cb(void *cls, | |||
124 | * failed | 124 | * failed |
125 | */ | 125 | */ |
126 | static void | 126 | static void |
127 | test_master(void *cls, | 127 | test_master (void *cls, |
128 | struct GNUNET_TESTBED_RunHandle *h, | 128 | struct GNUNET_TESTBED_RunHandle *h, |
129 | unsigned int num_peers, | 129 | unsigned int num_peers, |
130 | struct GNUNET_TESTBED_Peer **peers_, | 130 | struct GNUNET_TESTBED_Peer **peers_, |
131 | unsigned int links_succeeded, | 131 | unsigned int links_succeeded, |
132 | unsigned int links_failed) | 132 | unsigned int links_failed) |
133 | { | 133 | { |
134 | unsigned int peer; | 134 | unsigned int peer; |
135 | 135 | ||
136 | GNUNET_assert(NULL == cls); | 136 | GNUNET_assert (NULL == cls); |
137 | if (NULL == peers_) | 137 | if (NULL == peers_) |
138 | { | 138 | { |
139 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); | 139 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); |
140 | return; | 140 | return; |
141 | } | 141 | } |
142 | GNUNET_assert(NUM_PEERS == num_peers); | 142 | GNUNET_assert (NUM_PEERS == num_peers); |
143 | for (peer = 0; peer < num_peers; peer++) | 143 | for (peer = 0; peer < num_peers; peer++) |
144 | GNUNET_assert(NULL != peers_[peer]); | 144 | GNUNET_assert (NULL != peers_[peer]); |
145 | peers = peers_; | 145 | peers = peers_; |
146 | overlay_connects = 0; | 146 | overlay_connects = 0; |
147 | op = GNUNET_TESTBED_overlay_configure_topology(NULL, NUM_PEERS, peers, NULL, | 147 | op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL, |
148 | NULL, | 148 | NULL, |
149 | NULL, | 149 | NULL, |
150 | GNUNET_TESTBED_TOPOLOGY_CLIQUE, | 150 | GNUNET_TESTBED_TOPOLOGY_CLIQUE, |
151 | /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */ | 151 | /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */ |
152 | /* NUM_PEERS, */ | 152 | /* NUM_PEERS, */ |
153 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); | 153 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); |
154 | GNUNET_assert(NULL != op); | 154 | GNUNET_assert (NULL != op); |
155 | shutdown_task = | 155 | shutdown_task = |
156 | GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply | 156 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
157 | (GNUNET_TIME_UNIT_SECONDS, 300), | 157 | (GNUNET_TIME_UNIT_SECONDS, 300), |
158 | do_shutdown, NULL); | 158 | do_shutdown, NULL); |
159 | } | 159 | } |
160 | 160 | ||
161 | 161 | ||
@@ -163,7 +163,7 @@ test_master(void *cls, | |||
163 | * Main function | 163 | * Main function |
164 | */ | 164 | */ |
165 | int | 165 | int |
166 | main(int argc, char **argv) | 166 | main (int argc, char **argv) |
167 | { | 167 | { |
168 | uint64_t event_mask; | 168 | uint64_t event_mask; |
169 | 169 | ||
@@ -171,10 +171,10 @@ main(int argc, char **argv) | |||
171 | event_mask = 0; | 171 | event_mask = 0; |
172 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 172 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
173 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 173 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
174 | (void)GNUNET_TESTBED_test_run("test_testbed_api_test", | 174 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
175 | "test_testbed_api.conf", NUM_PEERS, | 175 | "test_testbed_api.conf", NUM_PEERS, |
176 | event_mask, &controller_event_cb, NULL, | 176 | event_mask, &controller_event_cb, NULL, |
177 | &test_master, NULL); | 177 | &test_master, NULL); |
178 | if (GNUNET_OK != result) | 178 | if (GNUNET_OK != result) |
179 | return 1; | 179 | return 1; |
180 | return 0; | 180 | return 0; |