From b1494db2e01d0a86b9e2a58353d4a5ef793584cf Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Wed, 23 Feb 2011 11:19:54 +0000 Subject: [PATCH] fixes to gauger calls --- src/core/test_core_api_reliability.c | 3 +-- src/datacache/perf_datacache.c | 10 ++++------ src/datastore/perf_datastore_api.c | 4 ++-- src/dht/gnunet-dht-driver.c | 5 +---- src/peerinfo/perf_peerinfo_api.c | 3 +-- src/util/perf_crypto_hash.c | 3 +-- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index cfb299f83..b73f01a57 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -132,8 +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_kb/s", - total_bytes * 1000 / 1024 / delta); + GAUGER ("Core throughput/s", total_bytes * 1000 / 1024 / delta, "kbs"); ok = 0; } diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 307fd739e..8d5b4540a 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -104,11 +104,10 @@ 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_ms", + "Time to PUT %u items in %s-datacache", ITERATIONS, plugin_name); - GAUGER (GNUNET_TIME_absolute_get_duration(start).rel_value, - gstr); + GAUGER (GNUNET_TIME_absolute_get_duration(start).rel_value, gstr, "ms"); start = GNUNET_TIME_absolute_get (); memset (&k, 0, sizeof (GNUNET_HashCode)); for (i = 0; i < ITERATIONS; i++) @@ -126,11 +125,10 @@ 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_ms", + "Time to try to GET %u items from %s-datacache", ITERATIONS, plugin_name); - GAUGER (GNUNET_TIME_absolute_get_duration(start).rel_value, - gstr); + GAUGER (GNUNET_TIME_absolute_get_duration(start).rel_value, gstr, "ms"); GNUNET_DATACACHE_destroy (h); ASSERT (ok == 0); diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 3d59a88d1..ad7dc86ef 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -301,10 +301,10 @@ run_continuation (void *cls, break; case RP_DONE: GNUNET_snprintf (gstr, sizeof (gstr), - "PUT operations in %s-datastore_op/s", + "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)); + GAUGER (gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "ops"); GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES); GNUNET_free (crc); ok = 0; diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index 98cf12fc7..636f02dcb 100644 --- a/src/dht/gnunet-dht-driver.c +++ b/src/dht/gnunet-dht-driver.c @@ -68,8 +68,6 @@ #define DEFAULT_BUCKET_SIZE 4 -#define FIND_PEER_THRESHOLD 1 - /* If more than this many peers are added, slow down sending */ #define MAX_FIND_PEER_CUTOFF 2000 @@ -2082,8 +2080,7 @@ count_peers_cb (void *cls, target_total_connections); if ((find_peer_context->last_sent < 8) || - ((find_peer_context->current_peers - find_peer_context->previous_peers > FIND_PEER_THRESHOLD) && - (find_peer_context->current_peers < 2 * connection_estimate(num_peers, DEFAULT_BUCKET_SIZE)) && + ((find_peer_context->current_peers < 2 * connection_estimate(num_peers, DEFAULT_BUCKET_SIZE)) && (GNUNET_TIME_absolute_get_remaining(find_peer_context->endtime).rel_value > 0) && (find_peer_context->current_peers < target_total_connections))) { diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 4f1d28f5c..780333515 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -187,8 +187,7 @@ check () "Received %u/%u calls before timeout\n", numpeers, NUM_REQUESTS * NUM_REQUESTS / 2); - GAUGER ("Peerinfo lookups_peers/s", - numpeers/30); + GAUGER ("Peerinfo lookups_peers", numpeers / 30, "s"); #if START_SERVICE if (0 != GNUNET_OS_process_kill (proc, SIGTERM)) { diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c index 1446aebaa..b4d0c7724 100644 --- a/src/util/perf_crypto_hash.c +++ b/src/util/perf_crypto_hash.c @@ -60,8 +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_kb/s", - 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value)); + GAUGER ("Cryptographic hashing", 1024 * 64 * 1024 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value), "kbs"); return 0; } -- 2.25.1