docu

[oweals/gnunet.git] / src / datacache / perf_datacache.c

diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index fd3891116d79e659e24b77ec8a21420766de7944..84775a314f349fbe20f88f1e8e95be303e40f2d3 100644 (file)
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include <gauger.h>
 
 
@@ -44,9 +44,12 @@ static const char *plugin_name;
 
 
 static int
-checkIt (void *cls, struct GNUNET_TIME_Absolute exp,
+checkIt (void *cls, 
          const struct GNUNET_HashCode * key, size_t size, const char *data,
-         enum GNUNET_BLOCK_Type type)
+         enum GNUNET_BLOCK_Type type,
+        struct GNUNET_TIME_Absolute exp,
+        unsigned int path_len,
+        const struct GNUNET_PeerIdentity *path)
 {
   if ((size == sizeof (struct GNUNET_HashCode)) && (0 == memcmp (data, cls, size)))
     found++;
@@ -84,13 +87,13 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
     ASSERT (GNUNET_OK ==
             GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
-                                  (const char *) &n, 1 + i % 16, exp));
+                                  (const char *) &n, 1 + i % 16, exp,
+                                 0, NULL));
     k = n;
   }
   FPRINTF (stderr, "%s",  "\n");
-  FPRINTF (stdout, "Stored %u items in %llums\n", ITERATIONS,
-           (unsigned long long)
-           GNUNET_TIME_absolute_get_duration (start).rel_value);
+  FPRINTF (stdout, "Stored %u items in %s\n", ITERATIONS,
+          GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES));
   GNUNET_snprintf (gstr, sizeof (gstr), "DATACACHE-%s", plugin_name);
   GAUGER (gstr, "Time to PUT item in datacache",
           GNUNET_TIME_absolute_get_duration (start).rel_value / ITERATIONS,
@@ -107,10 +110,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   FPRINTF (stderr, "%s",  "\n");
   FPRINTF (stdout,
-           "Found %u/%u items in %llums (%u were deleted during storage processing)\n",
+           "Found %u/%u items in %s (%u were deleted during storage processing)\n",
            found, ITERATIONS,
-           (unsigned long long)
-           GNUNET_TIME_absolute_get_duration (start).rel_value,
+           GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES),
            ITERATIONS - found);
   if (found > 0)
     GAUGER (gstr, "Time to GET item from datacache",