From: Nathan S. Evans Date: Thu, 24 Feb 2011 11:00:43 +0000 (+0000) Subject: Consistent GAUGER naming. X-Git-Tag: initial-import-from-subversion-38251~19063 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fae8cff7a52abe62eca5d6db8a8aa4d9a95da244;p=oweals%2Fgnunet.git Consistent GAUGER naming. --- 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) fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GAUGER ("Core throughput/s", total_bytes * 1000 / 1024 / delta, "kbs"); + GAUGER ("CORE:Core throughput/s", total_bytes * 1000 / 1024 / delta, "kb/s"); ok = 0; } 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, ITERATIONS, (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value); GNUNET_snprintf (gstr, sizeof (gstr), - "Time to PUT %u items in %s-datacache", + "DATACACHE:Time to PUT %u items in %s-datacache", ITERATIONS, plugin_name); GAUGER (gstr, GNUNET_TIME_absolute_get_duration(start).rel_value, "ms"); @@ -125,7 +125,7 @@ run (void *cls, (unsigned long long) GNUNET_TIME_absolute_get_duration(start).rel_value, ITERATIONS - found); GNUNET_snprintf (gstr, sizeof (gstr), - "Time to try to GET %u items from %s-datacache", + "DATACACHE:Time to try to GET %u items from %s-datacache", ITERATIONS, plugin_name); 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, break; case RP_DONE: GNUNET_snprintf (gstr, sizeof (gstr), - "PUT operations in %s-datastore", + "DATASTORE:PUT operations in %s-datastore", plugin_name); if (crc->i == ITERATIONS) 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 () "Received %u/%u calls before timeout\n", numpeers, NUM_REQUESTS * NUM_REQUESTS / 2); - GAUGER ("Peerinfo lookups", numpeers / 30, "peers/s"); + GAUGER ("PEERINFO:Peerinfo lookups", numpeers / 30, "peers/s"); #if START_SERVICE if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) { 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 () fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GNUNET_asprintf(&value_name, "reliable_%s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); + GNUNET_asprintf(&value_name, "TRANSPORT:reliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); GNUNET_free(value_name); ok = 0; 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 () "Transports disconnected, returning success!\n"); #endif delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; - GNUNET_asprintf(&value_name, "unreliable_%s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); + GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); GNUNET_free(value_name); fprintf (stderr, "\nThroughput was %llu kb/s\n", @@ -227,11 +227,11 @@ end_unreliably () fprintf (stderr, "\nThroughput was %llu kb/s\n", total_bytes * 1000 / 1024 / delta); - GNUNET_asprintf(&value_name, "unreliable_%s", test_name); - GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kbs"); + GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_%s", test_name); + GAUGER (value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s"); GNUNET_free(value_name); - GNUNET_asprintf(&value_name, "unreliable_failed_%s", test_name); - GAUGER (value_name, (int)num_failed, "count"); + GNUNET_asprintf(&value_name, "TRANSPORT:unreliable_failed_%s", test_name); + GAUGER (value_name, (int)num_failed, "msgs"); GNUNET_free(value_name); GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Had %d failed messages!\n", num_failed); 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[]) printf ("Hash perf took %llu ms\n", (unsigned long long) GNUNET_TIME_absolute_get_duration (start).rel_value); - GAUGER ("Cryptographic hashing", 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value), "kb/s"); + GAUGER ("UTIL:Cryptographic hashing", 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value), "kb/s"); return 0; }