api changes

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

diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 9e1881bd863bf56a7b3931cac387bf1c954eb82b..cc47bdb8fb512f13e5db59f2a3f16d140479273b 100644 (file)
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -44,10 +44,7 @@ static const char *plugin_name;
  * some of the data from the last iteration is still there.
  */
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
-     char *const *args,
-     const char *cfgfile, 
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_DATACACHE_Handle *h;
@@ -59,59 +56,42 @@ run (void *cls,
   struct GNUNET_TIME_Absolute exp;
 
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                              cfg,
-                              "testcache");
+  h = GNUNET_DATACACHE_create (cfg, "testcache");
 
   if (h == NULL)
-    {
-      fprintf (stderr,
-              "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
-      return;
-    }
-  exp = GNUNET_TIME_absolute_get ();
-  exp.value += 20 * 60 * 1000;
+  {
+    FPRINTF (stderr, "%s", "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    return;
+  }
+  exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
   memset (buf, 1, sizeof (buf));
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 10; i++)
+  {
+    FPRINTF (stderr, "%s",  ".");
+    GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
+    for (j = i; j < sizeof (buf); j += 10)
     {
-      fprintf (stderr, ".");
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      for (j = i; j < sizeof (buf); j += 10)
-        {
-         exp.value++;
-          buf[j] = i;
-          ASSERT (GNUNET_OK == 
-                 GNUNET_DATACACHE_put (h,
-                                       &k,
-                                       j,
-                                       buf,
-                                       1+i,
-                                       exp));
-         fprintf (stderr, "G");
-          ASSERT (0 < GNUNET_DATACACHE_get (h, 
-                                           &k, 1+i, 
-                                           NULL, NULL));
-        }
-      k = n;
+      exp.abs_value++;
+      buf[j] = i;
+      ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, &k, j, buf, 1 + i, exp));
+      ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
     }
-  fprintf (stderr, "\n");
+    k = n;
+  }
+  FPRINTF (stderr, "%s",  "\n");
   memset (&k, 0, sizeof (GNUNET_HashCode));
   for (i = 0; i < 10; i++)
-    {
-      fprintf (stderr, ".");
-      GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
-      if (i < 2)
-       ASSERT (0 == GNUNET_DATACACHE_get  (h, 
-                                           &k, 1+i, 
-                                           NULL, NULL));
-      if (i == 9)
-       ASSERT (0 < GNUNET_DATACACHE_get  (h, 
-                                          &k, 1+i, 
-                                          NULL, NULL));
-      k = n;
-    }
-  fprintf (stderr, "\n");
+  {
+    FPRINTF (stderr, "%s",  ".");
+    GNUNET_CRYPTO_hash (&k, sizeof (GNUNET_HashCode), &n);
+    if (i < 2)
+      ASSERT (0 == GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
+    if (i == 9)
+      ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
+    k = n;
+  }
+  FPRINTF (stderr, "%s",  "\n");
   GNUNET_DATACACHE_destroy (h);
   return;
 FAILURE:
@@ -124,9 +104,10 @@ FAILURE:
 int
 main (int argc, char *argv[])
 {
-  const char *pos;
+  char *pos;
   char cfg_name[128];
-  char *const xargv[] = { 
+
+  char *const xargv[] = {
     "test-datacache-quota",
     "-c",
     cfg_name,
@@ -138,7 +119,7 @@ main (int argc, char *argv[])
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
- 
+
   GNUNET_log_setup ("test-datacache-quota",
 #if VERBOSE
                     "DEBUG",
@@ -146,19 +127,24 @@ main (int argc, char *argv[])
                     "WARNING",
 #endif
                     NULL);
+
   /* determine name of plugin to use */
   plugin_name = argv[0];
-  while (NULL != (pos = strstr(plugin_name, "_")))
-    plugin_name = pos+1;
-  GNUNET_snprintf (cfg_name,
-                  sizeof (cfg_name),
-                  "test_datacache_data_%s.conf",
-                  plugin_name);
-  GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1,
-                      xargv, "test-datacache-quota", "nohelp",
-                      options, &run, NULL);
+  while (NULL != (pos = strstr (plugin_name, "_")))
+    plugin_name = pos + 1;
+  if (NULL != (pos = strstr (plugin_name, ".")))
+    pos[0] = 0;
+  else
+    pos = (char *) plugin_name;
+
+  GNUNET_snprintf (cfg_name, sizeof (cfg_name), "test_datacache_data_%s.conf",
+                   plugin_name);
+  if (pos != plugin_name)
+    pos[0] = '.';
+  GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
+                      "test-datacache-quota", "nohelp", options, &run, NULL);
   if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %d\n", ok);
+    FPRINTF (stderr, "Missed some testcases: %d\n", ok);
   return ok;
 }