[GNUnet-SVN] r14518 - in gnunet/src: core datacache datastore peerinfo transport util

[gnunet]

Author: nevans
Date: 2011-02-24 12:00:43 +0100 (Thu, 24 Feb 2011)
New Revision: 14518

Modified:
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/datacache/perf_datacache.c
   gnunet/src/datastore/perf_datastore_api.c
   gnunet/src/peerinfo/perf_peerinfo_api.c
   gnunet/src/transport/test_transport_api_reliability.c
   gnunet/src/transport/test_transport_api_unreliability.c
   gnunet/src/util/perf_crypto_hash.c
Log:
Consistent GAUGER naming.

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2011-02-24 09:47:23 UTC (rev 
14517)
+++ gnunet/src/core/test_core_api_reliability.c 2011-02-24 11:00:43 UTC (rev 
14518)
@@ -132,7 +132,7 @@
   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;
 }
 

Modified: gnunet/src/datacache/perf_datacache.c
===================================================================
--- gnunet/src/datacache/perf_datacache.c       2011-02-24 09:47:23 UTC (rev 
14517)
+++ gnunet/src/datacache/perf_datacache.c       2011-02-24 11:00:43 UTC (rev 
14518)
@@ -104,7 +104,7 @@
           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 @@
           (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");

Modified: gnunet/src/datastore/perf_datastore_api.c
===================================================================
--- gnunet/src/datastore/perf_datastore_api.c   2011-02-24 09:47:23 UTC (rev 
14517)
+++ gnunet/src/datastore/perf_datastore_api.c   2011-02-24 11:00:43 UTC (rev 
14518)
@@ -301,7 +301,7 @@
       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");

Modified: gnunet/src/peerinfo/perf_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/perf_peerinfo_api.c     2011-02-24 09:47:23 UTC (rev 
14517)
+++ gnunet/src/peerinfo/perf_peerinfo_api.c     2011-02-24 11:00:43 UTC (rev 
14518)
@@ -187,7 +187,7 @@
           "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))
     {

Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c       2011-02-24 
09:47:23 UTC (rev 14517)
+++ gnunet/src/transport/test_transport_api_reliability.c       2011-02-24 
11:00:43 UTC (rev 14518)
@@ -133,8 +133,8 @@
   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;
 

Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c     2011-02-24 
09:47:23 UTC (rev 14517)
+++ gnunet/src/transport/test_transport_api_unreliability.c     2011-02-24 
11:00:43 UTC (rev 14518)
@@ -186,8 +186,8 @@
              "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 @@
   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;

Modified: gnunet/src/util/perf_crypto_hash.c
===================================================================
--- gnunet/src/util/perf_crypto_hash.c  2011-02-24 09:47:23 UTC (rev 14517)
+++ gnunet/src/util/perf_crypto_hash.c  2011-02-24 11:00:43 UTC (rev 14518)
@@ -60,7 +60,7 @@
   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;
 }