diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:09:28 +0200 |
commit | c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 (patch) | |
tree | cac3ce030d77b4cbe7c7dc62ed58cfe6d24f73e1 /src/testbed/test_testbed_api_topology.c | |
parent | fbb71d527c7d6babf269a8fefce1db291b9f7068 (diff) | |
download | gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.tar.gz gnunet-c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207.zip |
global reindent, now with uncrustify hook enabled
Diffstat (limited to 'src/testbed/test_testbed_api_topology.c')
-rw-r--r-- | src/testbed/test_testbed_api_topology.c | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index c6e25c656..1fa13bf4f 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.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,36 +83,36 @@ 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) == 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) == 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 | if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && | ||
108 | (NULL != event->details.operation_finished.emsg)) | ||
109 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
110 | "An operation failed with error: %s\n", | ||
111 | event->details.operation_finished.emsg); | ||
112 | result = GNUNET_SYSERR; | ||
113 | GNUNET_SCHEDULER_cancel(shutdown_task); | ||
114 | shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); | ||
115 | } | 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 | if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && | ||
108 | (NULL != event->details.operation_finished.emsg)) | ||
109 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
110 | "An operation failed with error: %s\n", | ||
111 | event->details.operation_finished.emsg); | ||
112 | result = GNUNET_SYSERR; | ||
113 | GNUNET_SCHEDULER_cancel (shutdown_task); | ||
114 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
115 | } | ||
116 | } | 116 | } |
117 | 117 | ||
118 | 118 | ||
@@ -129,37 +129,37 @@ controller_event_cb(void *cls, | |||
129 | * failed | 129 | * failed |
130 | */ | 130 | */ |
131 | static void | 131 | static void |
132 | test_master(void *cls, | 132 | test_master (void *cls, |
133 | struct GNUNET_TESTBED_RunHandle *h, | 133 | struct GNUNET_TESTBED_RunHandle *h, |
134 | unsigned int num_peers, | 134 | unsigned int num_peers, |
135 | struct GNUNET_TESTBED_Peer **peers_, | 135 | struct GNUNET_TESTBED_Peer **peers_, |
136 | unsigned int links_succeeded, | 136 | unsigned int links_succeeded, |
137 | unsigned int links_failed) | 137 | unsigned int links_failed) |
138 | { | 138 | { |
139 | unsigned int peer; | 139 | unsigned int peer; |
140 | 140 | ||
141 | GNUNET_assert(NULL == cls); | 141 | GNUNET_assert (NULL == cls); |
142 | if (NULL == peers_) | 142 | if (NULL == peers_) |
143 | { | 143 | { |
144 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); | 144 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n"); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | GNUNET_assert(NUM_PEERS == num_peers); | 147 | GNUNET_assert (NUM_PEERS == num_peers); |
148 | for (peer = 0; peer < num_peers; peer++) | 148 | for (peer = 0; peer < num_peers; peer++) |
149 | GNUNET_assert(NULL != peers_[peer]); | 149 | GNUNET_assert (NULL != peers_[peer]); |
150 | peers = peers_; | 150 | peers = peers_; |
151 | overlay_connects = 0; | 151 | overlay_connects = 0; |
152 | op = GNUNET_TESTBED_overlay_configure_topology(NULL, NUM_PEERS, peers, NULL, | 152 | op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL, |
153 | NULL, | 153 | NULL, |
154 | NULL, | 154 | NULL, |
155 | GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, | 155 | GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, |
156 | NUM_PEERS, | 156 | NUM_PEERS, |
157 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); | 157 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); |
158 | GNUNET_assert(NULL != op); | 158 | GNUNET_assert (NULL != op); |
159 | shutdown_task = | 159 | shutdown_task = |
160 | GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply | 160 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
161 | (GNUNET_TIME_UNIT_SECONDS, 300), | 161 | (GNUNET_TIME_UNIT_SECONDS, 300), |
162 | do_shutdown, NULL); | 162 | do_shutdown, NULL); |
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
@@ -167,7 +167,7 @@ test_master(void *cls, | |||
167 | * Main function | 167 | * Main function |
168 | */ | 168 | */ |
169 | int | 169 | int |
170 | main(int argc, char **argv) | 170 | main (int argc, char **argv) |
171 | { | 171 | { |
172 | uint64_t event_mask; | 172 | uint64_t event_mask; |
173 | 173 | ||
@@ -175,10 +175,10 @@ main(int argc, char **argv) | |||
175 | event_mask = 0; | 175 | event_mask = 0; |
176 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 176 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
177 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 177 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
178 | (void)GNUNET_TESTBED_test_run("test_testbed_api_test", | 178 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
179 | "test_testbed_api.conf", NUM_PEERS, | 179 | "test_testbed_api.conf", NUM_PEERS, |
180 | event_mask, &controller_event_cb, NULL, | 180 | event_mask, &controller_event_cb, NULL, |
181 | &test_master, NULL); | 181 | &test_master, NULL); |
182 | if (GNUNET_OK != result) | 182 | if (GNUNET_OK != result) |
183 | return 1; | 183 | return 1; |
184 | return 0; | 184 | return 0; |