From 48197df156e707beed6c396b5248755ff82543a0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 May 2011 21:08:58 +0000
Subject: [PATCH] fix performance metric

---
 src/datastore/perf_datastore_api.c    | 10 +++--
 src/datastore/perf_plugin_datastore.c | 54 +++++++++++++--------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 92a56846d..9d7755342 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -283,10 +283,14 @@ run_continuation (void *cls,
       break;
     case RP_DONE:
       GNUNET_snprintf (gstr, sizeof (gstr),
-		       "PUT operations in %s-datastore",
+		       "DATASTORE-%s",
 		       plugin_name);
-      if (crc->i == ITERATIONS)
-	GAUGER ("DATASTORE", gstr, 1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value), "op/s");
+      if ( (crc->i == ITERATIONS) &&
+	   (stored_ops > 0) )
+	GAUGER (gstr,
+		"PUT operation duration", 
+		GNUNET_TIME_absolute_get_duration(start_time).rel_value / stored_ops, 
+		"ms/operation");
       GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
       GNUNET_free (crc);
       ok = 0;
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 7a8a0d4cf..a231b8e64 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -185,7 +185,6 @@ iterate_zeros (void *cls,
   crc->cnt++;
   if (crc->cnt == PUT_10 / 4 - 1)
     {
-      char buf[256];
       unsigned int bc;
 
       bc = 0;
@@ -194,15 +193,15 @@ iterate_zeros (void *cls,
 	  bc++;
       
       crc->end = GNUNET_TIME_absolute_get();
-      GNUNET_snprintf (buf, sizeof (buf),
-		       "Iteration over %u zero-anonymity items",
-		       crc->cnt);
       printf ("%s took %llu ms yielding %u/%u items\n",
-	      buf,
+	      "Select random zero-anonymity item",
 	      (unsigned long long) (crc->end.abs_value - crc->start.abs_value),
 	      bc,
 	      crc->cnt);
-      GAUGER (category, buf, crc->end.abs_value - crc->start.abs_value, "ms");
+      if (crc->cnt > 0)
+	GAUGER (category,
+		"Select random zero-anonymity item",
+		(crc->end.abs_value - crc->start.abs_value) / crc->cnt, "ms/item");
       memset (hits, 0, sizeof (hits));
       crc->phase++;
       crc->cnt = 0;
@@ -235,7 +234,6 @@ expiration_get (void *cls,
   crc->cnt++;
   if (PUT_10 <= crc->cnt)
     {
-      char buf[256];
       unsigned int bc;
 
       bc = 0;
@@ -244,15 +242,16 @@ expiration_get (void *cls,
 	  bc++;
       
       crc->end = GNUNET_TIME_absolute_get();
-      GNUNET_snprintf (buf, sizeof (buf),
-		       "Execution of %u expiration+deletion-GET requests",
-		       PUT_10);
       printf ("%s took %llu ms yielding %u/%u items\n",
-	      buf,
+	      "Selecting and deleting by expiration",
 	      (unsigned long long) (crc->end.abs_value - crc->start.abs_value),
 	      bc,
 	      (unsigned int) PUT_10);
-      GAUGER (category, buf, crc->end.abs_value - crc->start.abs_value, "ms");
+      if (crc->cnt > 0)
+	GAUGER (category, 
+		"Selecting and deleting by expiration",
+		(crc->end.abs_value - crc->start.abs_value) / crc->cnt,
+		"ms/item");
       memset (hits, 0, sizeof (hits));
       if (++crc->iter == ITERATIONS)
 	crc->phase++;
@@ -289,7 +288,6 @@ replication_get (void *cls,
   crc->cnt++;
   if (PUT_10 <= crc->cnt)
     {
-      char buf[256];
       unsigned int bc;
 
       bc = 0;
@@ -298,15 +296,16 @@ replication_get (void *cls,
 	  bc++;
       
       crc->end = GNUNET_TIME_absolute_get();
-      GNUNET_snprintf (buf, sizeof (buf),
-		       "Execution of %u replication-GET requests",
-		       PUT_10);
       printf ("%s took %llu ms yielding %u/%u items\n",
-	      buf,
+	      "Selecting random item for replication",
 	      (unsigned long long) (crc->end.abs_value - crc->start.abs_value),
 	      bc,
 	      (unsigned int) PUT_10);
-      GAUGER (category, buf, crc->end.abs_value - crc->start.abs_value, "ms");
+      if (crc->cnt > 0)
+	GAUGER (category, 
+		"Selecting random item for replication",
+		(crc->end.abs_value - crc->start.abs_value) / crc->cnt, 
+		"ms/item");
       memset (hits, 0, sizeof (hits));
       crc->phase++;
       crc->offset = 0;
@@ -397,16 +396,15 @@ test (void *cls,
 	putValue (crc->api, j, crc->i);
       crc->end = GNUNET_TIME_absolute_get ();
       {
-	char buf[256];      
-
-	GNUNET_snprintf (buf, sizeof (buf),
-			 "Execution of %u PUT requests",
-			 PUT_10);
-	printf ("%s took %llu ms\n",
-		buf,
-		(unsigned long long) (crc->end.abs_value - crc->start.abs_value));
-	GAUGER (category, 
-		buf, crc->end.abs_value - crc->start.abs_value, "ms");
+	printf ("%s took %llu ms for %llu items\n",
+		"Storing an item", 
+		(unsigned long long) (crc->end.abs_value - crc->start.abs_value),
+		PUT_10);
+	if (PUT_10 > 0)
+	  GAUGER (category, 
+		  "Storing an item", 
+		  (crc->end.abs_value - crc->start.abs_value) / PUT_10,
+		  "ms/item");
       }
       crc->i++;
       crc->start = GNUNET_TIME_absolute_get ();      
-- 
2.25.1