- remove http

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

diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index a5dc0236205205019bf60d8828124c107bef1f5a..77edbf92552c52fb0b0288fc04ca9ab3f7a45ba6 100644 (file)
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -71,28 +71,26 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (h == NULL)
   {
-    fprintf (stderr,
-             "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    FPRINTF (stderr, "%s", "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
     return;
   }
-  exp = GNUNET_TIME_absolute_get ();
-  start = exp;
-  exp.abs_value += 5 * 60 * 1000;
+  exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
+  start = GNUNET_TIME_absolute_get ();
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < ITERATIONS; i++)
   {
     if (0 == i % (ITERATIONS / 80))
-      fprintf (stderr, ".");
+      FPRINTF (stderr, "%s",  ".");
     GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
     ASSERT (GNUNET_OK ==
             GNUNET_DATACACHE_put (h, &k, sizeof (GNUNET_HashCode),
                                   (const char *) &n, 1 + i % 16, exp));
     k = n;
   }
-  fprintf (stderr, "\n");
-  fprintf (stdout, "Stored %u items in %llums\n", ITERATIONS,
-           (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-           rel_value);
+  FPRINTF (stderr, "%s",  "\n");
+  FPRINTF (stdout, "Stored %u items in %llums\n", ITERATIONS,
+           (unsigned long long)
+           GNUNET_TIME_absolute_get_duration (start).rel_value);
   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,
@@ -102,17 +100,18 @@ run (void *cls, char *const *args, const char *cfgfile,
   for (i = 0; i < ITERATIONS; i++)
   {
     if (0 == i % (ITERATIONS / 80))
-      fprintf (stderr, ".");
+      FPRINTF (stderr, "%s",  ".");
     GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
     GNUNET_DATACACHE_get (h, &k, 1 + i % 16, &checkIt, &n);
     k = n;
   }
-  fprintf (stderr, "\n");
-  fprintf (stdout,
+  FPRINTF (stderr, "%s",  "\n");
+  FPRINTF (stdout,
            "Found %u/%u items in %llums (%u were deleted during storage processing)\n",
            found, ITERATIONS,
-           (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-           rel_value, ITERATIONS - found);
+           (unsigned long long)
+           GNUNET_TIME_absolute_get_duration (start).rel_value,
+           ITERATIONS - found);
   if (found > 0)
     GAUGER (gstr, "Time to GET item from datacache",
             GNUNET_TIME_absolute_get_duration (start).rel_value / found,
@@ -169,7 +168,7 @@ main (int argc, char *argv[])
   GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
                       "perf-datacache", "nohelp", options, &run, NULL);
   if (ok != 0)
-    fprintf (stderr, "Missed some perfcases: %d\n", ok);
+    FPRINTF (stderr, "Missed some perfcases: %d\n", ok);
   return ok;
 }