diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-02-23 10:52:16 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-02-23 10:52:16 +0000 |
commit | 04518c0f2565baa715018b9546afa1858369d20e (patch) | |
tree | a27eb549732a95813593e3872b5332fe4dd28d64 /src/transport | |
parent | 5767d95fbe94bb43b3557a59335f4fac30907408 (diff) | |
download | gnunet-04518c0f2565baa715018b9546afa1858369d20e.tar.gz gnunet-04518c0f2565baa715018b9546afa1858369d20e.zip |
gauger changes, thanks bart (:
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/test_quota_compliance.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability.c | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 20a9b1f15..219971725 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c | |||
@@ -669,7 +669,7 @@ exchange_hello (void *cls, | |||
669 | GNUNET_assert (GNUNET_OK == | 669 | GNUNET_assert (GNUNET_OK == |
670 | GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) | 670 | GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) |
671 | message, &me->id)); | 671 | message, &me->id)); |
672 | GNUNET_TRANSPORT_offer_hello (p2.th, message); | 672 | GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); |
673 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); | 673 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); |
674 | } | 674 | } |
675 | 675 | ||
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 60cb7866f..d78e3264b 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -351,7 +351,7 @@ exchange_hello (void *cls, | |||
351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
352 | "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); | 352 | "Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); |
353 | 353 | ||
354 | GNUNET_TRANSPORT_offer_hello (p2.th, message); | 354 | GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); |
355 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); | 355 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); |
356 | } | 356 | } |
357 | 357 | ||
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 472c30d0d..a5929ff48 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c | |||
@@ -133,8 +133,8 @@ end () | |||
133 | fprintf (stderr, | 133 | fprintf (stderr, |
134 | "\nThroughput was %llu kb/s\n", | 134 | "\nThroughput was %llu kb/s\n", |
135 | total_bytes * 1000 / 1024 / delta); | 135 | total_bytes * 1000 / 1024 / delta); |
136 | GNUNET_asprintf(&value_name, "reliable-%s_kb/s", test_name); | 136 | GNUNET_asprintf(&value_name, "reliable_%s", test_name); |
137 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); | 137 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); |
138 | GNUNET_free(value_name); | 138 | GNUNET_free(value_name); |
139 | ok = 0; | 139 | ok = 0; |
140 | 140 | ||
@@ -527,7 +527,7 @@ exchange_hello (void *cls, | |||
527 | "Received HELLO size %d\n", | 527 | "Received HELLO size %d\n", |
528 | GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); | 528 | GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); |
529 | #endif | 529 | #endif |
530 | GNUNET_TRANSPORT_offer_hello (p2.th, message); | 530 | GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); |
531 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); | 531 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); |
532 | } | 532 | } |
533 | 533 | ||
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 26d4cb035..62c9a5683 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c | |||
@@ -186,8 +186,8 @@ end () | |||
186 | "Transports disconnected, returning success!\n"); | 186 | "Transports disconnected, returning success!\n"); |
187 | #endif | 187 | #endif |
188 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; | 188 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; |
189 | GNUNET_asprintf(&value_name, "unreliable-%s_kb/s", test_name); | 189 | GNUNET_asprintf(&value_name, "unreliable_%s", test_name); |
190 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); | 190 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); |
191 | GNUNET_free(value_name); | 191 | GNUNET_free(value_name); |
192 | fprintf (stderr, | 192 | fprintf (stderr, |
193 | "\nThroughput was %llu kb/s\n", | 193 | "\nThroughput was %llu kb/s\n", |
@@ -227,11 +227,11 @@ end_unreliably () | |||
227 | fprintf (stderr, | 227 | fprintf (stderr, |
228 | "\nThroughput was %llu kb/s\n", | 228 | "\nThroughput was %llu kb/s\n", |
229 | total_bytes * 1000 / 1024 / delta); | 229 | total_bytes * 1000 / 1024 / delta); |
230 | GNUNET_asprintf(&value_name, "unreliable-%s_kb/s", test_name); | 230 | GNUNET_asprintf(&value_name, "unreliable_%s", test_name); |
231 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta)); | 231 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); |
232 | GNUNET_free(value_name); | 232 | GNUNET_free(value_name); |
233 | GNUNET_asprintf(&value_name, "unreliable-%s_failed messages", test_name); | 233 | GNUNET_asprintf(&value_name, "unreliable_failed_%s", test_name); |
234 | GAUGER (value_name, (int)num_failed); | 234 | GAUGER (value_name, (int)num_failed, "count"); |
235 | GNUNET_free(value_name); | 235 | GNUNET_free(value_name); |
236 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Had %d failed messages!\n", num_failed); | 236 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Had %d failed messages!\n", num_failed); |
237 | ok = 0; | 237 | ok = 0; |
@@ -624,7 +624,7 @@ exchange_hello (void *cls, | |||
624 | "Received HELLO size %d\n", | 624 | "Received HELLO size %d\n", |
625 | GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); | 625 | GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message)); |
626 | #endif | 626 | #endif |
627 | GNUNET_TRANSPORT_offer_hello (p2.th, message); | 627 | GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); |
628 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); | 628 | GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); |
629 | } | 629 | } |
630 | 630 | ||