[GNUnet-SVN] r14500 - in gnunet/src: core datacache datastore dht peerinfo util

[gnunet]

Author: nevans
Date: 2011-02-23 12:19:54 +0100 (Wed, 23 Feb 2011)
New Revision: 14500

Modified:
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/datacache/perf_datacache.c
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/dht/gnunet-dht-driver.c
   gnunet/src/peerinfo/perf_peerinfo_api.c
   gnunet/src/util/perf_crypto_hash.c
Log:
fixes to gauger calls

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2011-02-23 11:11:12 UTC (rev 
14499)
+++ gnunet/src/core/test_core_api_reliability.c 2011-02-23 11:19:54 UTC (rev 
14500)
@@ -132,8 +132,7 @@
   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;
 }
 

Modified: gnunet/src/datacache/perf_datacache.c
===================================================================
--- gnunet/src/datacache/perf_datacache.c       2011-02-23 11:11:12 UTC (rev 
14499)
+++ gnunet/src/datacache/perf_datacache.c       2011-02-23 11:19:54 UTC (rev 
14500)
@@ -104,11 +104,10 @@
           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 @@
           (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);

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2011-02-23 11:11:12 UTC (rev 
14499)
+++ gnunet/src/datastore/perf_datastore_api.c   2011-02-23 11:19:54 UTC (rev 
14500)
@@ -301,10 +301,10 @@
       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;

Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2011-02-23 11:11:12 UTC (rev 14499)
+++ gnunet/src/dht/gnunet-dht-driver.c  2011-02-23 11:19:54 UTC (rev 14500)
@@ -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 @@
                                             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)))
         {

Modified: gnunet/src/peerinfo/perf_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/perf_peerinfo_api.c     2011-02-23 11:11:12 UTC (rev 
14499)
+++ gnunet/src/peerinfo/perf_peerinfo_api.c     2011-02-23 11:19:54 UTC (rev 
14500)
@@ -187,8 +187,7 @@
           "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))
     {

Modified: gnunet/src/util/perf_crypto_hash.c
===================================================================
--- gnunet/src/util/perf_crypto_hash.c  2011-02-23 11:11:12 UTC (rev 14499)
+++ gnunet/src/util/perf_crypto_hash.c  2011-02-23 11:19:54 UTC (rev 14500)
@@ -60,8 +60,7 @@
   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;
 }