quotatest

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index f3b17757bfc61b10b35aa8545a86d1aec133a715..c650521d668b2580891610710cfea0afe9541ebc 100644 (file)
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -48,6 +48,7 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \
 
 check_PROGRAMS = \
  test_datacache_api \
+ test_datacache_api_quota \
  perf_datacache_api 
 
 TESTS = $(check_PROGRAMS)
@@ -58,6 +59,12 @@ test_datacache_api_LDADD = \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_datacache_api_quota_SOURCES = \
+ test_datacache_api_quota.c
+test_datacache_api_quota_LDADD = \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 perf_datacache_api_SOURCES = \
  perf_datacache_api.c
 perf_datacache_api_LDADD = \

diff --git a/src/datacache/perf_datacache_api.c b/src/datacache/perf_datacache_api.c
index cf527f0df96f0598140ae3458f3d4c43456a34ee..b1c8d4ba64e222f4267a51832d8ca2d42c73e251 100644 (file)
--- a/src/datacache/perf_datacache_api.c
+++ b/src/datacache/perf_datacache_api.c
@@ -26,7 +26,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
 

diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 636303efc30558e2803b1e484ea4bcf434206809..51bbf60d7302c063a023c2da1302366f592fa632 100644 (file)
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -28,7 +28,7 @@
 #include "plugin_datacache.h"
 #include <sqlite3.h>
 
-#define DEBUG_DATACACHE_SQLITE GNUNET_YES
+#define DEBUG_DATACACHE_SQLITE GNUNET_NO
 
 /**
  * How much overhead do we assume per entry in the
@@ -178,7 +178,6 @@ sqlite_plugin_get (void *cls,
   char scratch[256];
 
   now = GNUNET_TIME_absolute_get ();
-
 #if DEBUG_DATACACHE_SQLITE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Processing `%s' for key `%4s'\n",

diff --git a/src/datacache/test_datacache_api.c b/src/datacache/test_datacache_api.c
index 124f75a12e11da99bde29fd7220057d9b26b7d93..0b36e0ef22bd696eea719817e461357b17950de6 100644 (file)
--- a/src/datacache/test_datacache_api.c
+++ b/src/datacache/test_datacache_api.c
@@ -133,7 +133,6 @@ main (int argc, char *argv[])
 {
   int ret;
   
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datacache");
   GNUNET_log_setup ("test-datacache-api",
 #if VERBOSE
                     "DEBUG",

diff --git a/src/datacache/test_datacache_api_data.conf b/src/datacache/test_datacache_api_data.conf
index a64ff291d6307622d9da3d251e9516457d6bd584..2e8606682d4c8ba0d3394a9890aa63b12a74c411 100644 (file)
--- a/src/datacache/test_datacache_api_data.conf
+++ b/src/datacache/test_datacache_api_data.conf
@@ -1,4 +1,4 @@
 
 [testcache]
-QUOTA = 50000
+QUOTA = 1000000
 DATABASE = sqlite

diff --git a/src/datacache/test_datacache_api_quota.c b/src/datacache/test_datacache_api_quota.c
new file mode 100644 (file)
index 0000000..fda5d42
--- /dev/null
+++ b/src/datacache/test_datacache_api_quota.c
@@ -0,0 +1,151 @@
+/*
+     This file is part of GNUnet.
+     (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/*
+ * @file datacache/test_datacache_api_quota.c
+ * @brief Test for the quota code of the datacache implementations.
+ * @author Nils Durner
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_datacache_lib.h"
+
+#define VERBOSE GNUNET_NO
+
+#define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
+
+static int ok;
+
+/**
+ * Quota is 1 MB.  Each iteration of the test puts in about 1 MB of
+ * data.  We do 10 iterations. Afterwards we check that the data from
+ * the first 5 iterations has all been discarded and that at least
+ * 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, struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_DATACACHE_Handle *h;
+  GNUNET_HashCode k;
+  GNUNET_HashCode n;
+  unsigned int i;
+  unsigned int j;
+  char buf[3200];
+  struct GNUNET_TIME_Absolute exp;
+
+  ok = 0;
+  h = GNUNET_DATACACHE_create (sched,
+                              cfg,
+                              "testcache");
+
+  ASSERT (NULL != h);
+  exp = GNUNET_TIME_absolute_get ();
+  exp.value += 5 * 60 * 1000;
+  memset (buf, 1, sizeof (buf));
+  memset (&k, 0, sizeof (GNUNET_HashCode));
+  for (i = 0; i < 10; i++)
+    {
+      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));
+          ASSERT (0 < GNUNET_DATACACHE_get (h, 
+                                           &k, 1+i, 
+                                           NULL, NULL));
+        }
+      k = n;
+    }
+  fprintf (stderr, "\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");
+  return;
+FAILURE:
+  if (h != NULL)
+    GNUNET_DATACACHE_destroy (h);
+  ok = GNUNET_SYSERR;
+}
+
+
+static int
+check ()
+{
+  char *const argv[] = { "test-datacache-api-quota",
+    "-c",
+    "test_datacache_api_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                      argv, "test-datacache-api-quota", "nohelp",
+                      options, &run, NULL);
+  if (ok != 0)
+    fprintf (stderr, "Missed some testcases: %d\n", ok);
+  return ok;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+  
+  GNUNET_log_setup ("test-datacache-api-quota",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+
+  return ret;
+}
+
+/* end of test_datacache_api_quota.c */