diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-07-14 15:29:28 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-07-14 15:29:28 +0000 |
commit | b1dbcfcf51167b5eb15596cec02561a5be84cef2 (patch) | |
tree | 330ee05f6715a8b932b0410cab44d54e8c661be0 /src/transport/test_transport_api_reliability.c | |
parent | 120e89e926f31f43712d569ae68e476792a738cd (diff) | |
download | gnunet-b1dbcfcf51167b5eb15596cec02561a5be84cef2.tar.gz gnunet-b1dbcfcf51167b5eb15596cec02561a5be84cef2.zip |
Diffstat (limited to 'src/transport/test_transport_api_reliability.c')
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index f1e3cf79b..b77aed545 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -80,6 +80,8 @@ static int is_wlan; | |||
80 | 80 | ||
81 | static int connected; | 81 | static int connected; |
82 | 82 | ||
83 | static int test_failed; | ||
84 | |||
83 | static unsigned long long total_bytes; | 85 | static unsigned long long total_bytes; |
84 | 86 | ||
85 | static struct GNUNET_TIME_Absolute start_time; | 87 | static struct GNUNET_TIME_Absolute start_time; |
@@ -163,14 +165,18 @@ stop_arm (struct PeerContext *p) | |||
163 | 165 | ||
164 | static void | 166 | static void |
165 | end_badly (void *cls, | 167 | end_badly (void *cls, |
166 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 168 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
167 | { | 169 | { |
168 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 170 | if (test_failed == GNUNET_NO) |
169 | "Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n", | 171 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
170 | msg_sent, | 172 | "Testcase timeout\n"); |
171 | msg_scheduled, | 173 | else |
172 | msg_recv, | 174 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
173 | msg_recv_expected); | 175 | "Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n", |
176 | msg_sent, | ||
177 | msg_scheduled, | ||
178 | msg_recv, | ||
179 | msg_recv_expected); | ||
174 | if (th_p2 != NULL) | 180 | if (th_p2 != NULL) |
175 | GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2); | 181 | GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2); |
176 | th_p2 = NULL; | 182 | th_p2 = NULL; |
@@ -187,6 +193,7 @@ end_badly (void *cls, | |||
187 | } | 193 | } |
188 | 194 | ||
189 | 195 | ||
196 | |||
190 | struct TestMessage | 197 | struct TestMessage |
191 | { | 198 | { |
192 | struct GNUNET_MessageHeader header; | 199 | struct GNUNET_MessageHeader header; |
@@ -233,6 +240,7 @@ notify_receive (void *cls, | |||
233 | ntohl (hdr->num)); | 240 | ntohl (hdr->num)); |
234 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 241 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
235 | GNUNET_SCHEDULER_cancel (die_task); | 242 | GNUNET_SCHEDULER_cancel (die_task); |
243 | test_failed = GNUNET_YES; | ||
236 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 244 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
237 | return; | 245 | return; |
238 | } | 246 | } |
@@ -245,6 +253,7 @@ notify_receive (void *cls, | |||
245 | ntohl (hdr->num)); | 253 | ntohl (hdr->num)); |
246 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 254 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
247 | GNUNET_SCHEDULER_cancel (die_task); | 255 | GNUNET_SCHEDULER_cancel (die_task); |
256 | test_failed = GNUNET_YES; | ||
248 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 257 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
249 | return; | 258 | return; |
250 | } | 259 | } |
@@ -258,6 +267,7 @@ notify_receive (void *cls, | |||
258 | n, (unsigned char) n); | 267 | n, (unsigned char) n); |
259 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 268 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
260 | GNUNET_SCHEDULER_cancel (die_task); | 269 | GNUNET_SCHEDULER_cancel (die_task); |
270 | test_failed = GNUNET_YES; | ||
261 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 271 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
262 | return; | 272 | return; |
263 | } | 273 | } |
@@ -844,6 +854,8 @@ main (int argc, char *argv[]) | |||
844 | { | 854 | { |
845 | int ret; | 855 | int ret; |
846 | 856 | ||
857 | test_failed = GNUNET_NO; | ||
858 | |||
847 | if (strstr(argv[0], "tcp_nat") != NULL) | 859 | if (strstr(argv[0], "tcp_nat") != NULL) |
848 | { | 860 | { |
849 | is_tcp_nat = GNUNET_YES; | 861 | is_tcp_nat = GNUNET_YES; |