diff options
-rw-r--r-- | src/core/test_core_api_reliability.c | 2 | ||||
-rw-r--r-- | src/datacache/perf_datacache.c | 4 | ||||
-rw-r--r-- | src/datastore/perf_datastore_api.c | 2 | ||||
-rwxr-xr-x | src/peerinfo/perf_peerinfo_api.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_reliability.c | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api_unreliability.c | 12 | ||||
-rw-r--r-- | src/util/perf_crypto_hash.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index b73f01a57..590ed7bb1 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -132,7 +132,7 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
132 | fprintf (stderr, | 132 | fprintf (stderr, |
133 | "\nThroughput was %llu kb/s\n", | 133 | "\nThroughput was %llu kb/s\n", |
134 | total_bytes * 1000 / 1024 / delta); | 134 | total_bytes * 1000 / 1024 / delta); |
135 | GAUGER ("Core throughput/s", total_bytes * 1000 / 1024 / delta, "kbs"); | 135 | GAUGER ("CORE:Core throughput/s", total_bytes * 1000 / 1024 / delta, "kb/s"); |
136 | ok = 0; | 136 | ok = 0; |
137 | } | 137 | } |
138 | 138 | ||
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 303c226d0..51f6674d6 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c | |||
@@ -104,7 +104,7 @@ run (void *cls, | |||
104 | ITERATIONS, | 104 | ITERATIONS, |
105 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value); | 105 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value); |
106 | GNUNET_snprintf (gstr, sizeof (gstr), | 106 | GNUNET_snprintf (gstr, sizeof (gstr), |
107 | "Time to PUT %u items in %s-datacache", | 107 | "DATACACHE:Time to PUT %u items in %s-datacache", |
108 | ITERATIONS, | 108 | ITERATIONS, |
109 | plugin_name); | 109 | plugin_name); |
110 | GAUGER (gstr, GNUNET_TIME_absolute_get_duration(start).rel_value, "ms"); | 110 | GAUGER (gstr, GNUNET_TIME_absolute_get_duration(start).rel_value, "ms"); |
@@ -125,7 +125,7 @@ run (void *cls, | |||
125 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value, | 125 | (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value, |
126 | ITERATIONS - found); | 126 | ITERATIONS - found); |
127 | GNUNET_snprintf (gstr, sizeof (gstr), | 127 | GNUNET_snprintf (gstr, sizeof (gstr), |
128 | "Time to try to GET %u items from %s-datacache", | 128 | "DATACACHE:Time to try to GET %u items from %s-datacache", |
129 | ITERATIONS, | 129 | ITERATIONS, |
130 | plugin_name); | 130 | plugin_name); |
131 | GAUGER (gstr, GNUNET_TIME_absolute_get_duration(start).rel_value, "ms"); | 131 | GAUGER (gstr, GNUNET_TIME_absolute_get_duration(start).rel_value, "ms"); |
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index eb4786c2b..c104ff738 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c | |||
@@ -301,7 +301,7 @@ run_continuation (void *cls, | |||
301 | break; | 301 | break; |
302 | case RP_DONE: | 302 | case RP_DONE: |
303 | GNUNET_snprintf (gstr, sizeof (gstr), | 303 | GNUNET_snprintf (gstr, sizeof (gstr), |
304 | "PUT operations in %s-datastore", | 304 | "DATASTORE:PUT operations in %s-datastore", |
305 | plugin_name); | 305 | plugin_name); |
306 | if (crc->i == ITERATIONS) | 306 | if (crc->i == ITERATIONS) |
307 | GAUGER (gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "op/s"); | 307 | GAUGER (gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "op/s"); |
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index dbeb42251..cf50b2f8d 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c | |||
@@ -187,7 +187,7 @@ check () | |||
187 | "Received %u/%u calls before timeout\n", | 187 | "Received %u/%u calls before timeout\n", |
188 | numpeers, | 188 | numpeers, |
189 | NUM_REQUESTS * NUM_REQUESTS / 2); | 189 | NUM_REQUESTS * NUM_REQUESTS / 2); |
190 | GAUGER ("Peerinfo lookups", numpeers / 30, "peers/s"); | 190 | GAUGER ("PEERINFO:Peerinfo lookups", numpeers / 30, "peers/s"); |
191 | #if START_SERVICE | 191 | #if START_SERVICE |
192 | if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) | 192 | if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) |
193 | { | 193 | { |
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index a5929ff48..09dc82f58 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", test_name); | 136 | GNUNET_asprintf(&value_name, "TRANSPORT:reliable_%s", test_name); |
137 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); | 137 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); |
138 | GNUNET_free(value_name); | 138 | GNUNET_free(value_name); |
139 | ok = 0; | 139 | ok = 0; |
140 | 140 | ||
diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 62c9a5683..1c0c3db2c 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", test_name); | 189 | GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_%s", test_name); |
190 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); | 190 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); |
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", test_name); | 230 | GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_%s", test_name); |
231 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); | 231 | GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); |
232 | GNUNET_free(value_name); | 232 | GNUNET_free(value_name); |
233 | GNUNET_asprintf(&value_name, "unreliable_failed_%s", test_name); | 233 | GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_failed_%s", test_name); |
234 | GAUGER (value_name, (int)num_failed, "count"); | 234 | GAUGER (value_name, (int)num_failed, "msgs"); |
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; |
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c index 22faeb959..f04d9b9d6 100644 --- a/src/util/perf_crypto_hash.c +++ b/src/util/perf_crypto_hash.c | |||
@@ -60,7 +60,7 @@ main (int argc, char *argv[]) | |||
60 | printf ("Hash perf took %llu ms\n", | 60 | printf ("Hash perf took %llu ms\n", |
61 | (unsigned long long) | 61 | (unsigned long long) |
62 | GNUNET_TIME_absolute_get_duration (start).rel_value); | 62 | GNUNET_TIME_absolute_get_duration (start).rel_value); |
63 | GAUGER ("Cryptographic hashing", 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value), "kb/s"); | 63 | GAUGER ("UTIL:Cryptographic hashing", 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value), "kb/s"); |
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | 66 | ||